summaryrefslogtreecommitdiff
path: root/perl/Git/SVN/Fetcher.pm
diff options
context:
space:
mode:
authorLibravatar Michael Contreras <michael@inetric.com>2013-03-30 18:06:42 -0400
committerLibravatar Eric Wong <normalperson@yhbt.net>2013-05-09 01:07:39 +0000
commite234ac9d47b6618f7b7338f95f34d0b70782e4cb (patch)
treebaee311f98066eff3566e786889c3c95ab286e9a /perl/Git/SVN/Fetcher.pm
parentUpdate draft release notes for 1.8.3 (diff)
downloadtgif-e234ac9d47b6618f7b7338f95f34d0b70782e4cb.tar.xz
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>
Diffstat (limited to 'perl/Git/SVN/Fetcher.pm')
0 files changed, 0 insertions, 0 deletions