tree baee311f98066eff3566e786889c3c95ab286e9a
parent 9b795193a6a7e963db62d9cd8e86752a40940520
author Michael Contreras <michael@inetric.com> 1364681202 -0400
committer Eric Wong <normalperson@yhbt.net> 1368061659 +0000

git-svn: avoid self-referencing mergeinfo

When svn.pushmergeinfo is set, the target branch is included in the
mergeinfo if it was previously merged into one of the source branches.
SVN does not do this.

Remove merge target branch path from resulting mergeinfo when
svn.pushmergeinfo is set to better match the behavior of SVN. Update the
svn-mergeinfo-push test.

[ew: 80 columns]

Signed-off-by: Michael Contreras <michael@inetric.com>
Reported-by: Avishay Lavie <avishay.lavie@gmail.com>
Acked-by: Eric Wong <normalperson@yhbt.net>