* [PATCH] git-svn: avoid self-referencing mergeinfo
@ 2013-03-30 22:06 Michael Contreras
2013-04-04 1:31 ` Eric Wong
0 siblings, 1 reply; 2+ messages in thread
From: Michael Contreras @ 2013-03-30 22:06 UTC (permalink / raw)
To: git; +Cc: Bryan Jacobs, Eric Wong, Avishay Lavie, Sam Vilain
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.
Signed-off-by: Michael Contreras <michael@inetric•com>
Reported-by: Avishay Lavie <avishay.lavie@gmail•com>
---
Avishay's original patch was never applied.
http://thread.gmane.org/gmane.comp.version-control.git/193123
git-svn.perl | 9 ++++++---
t/t9161-git-svn-mergeinfo-push.sh | 1 -
2 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/git-svn.perl b/git-svn.perl
index b46795f..bd4388d 100755
--- a/git-svn.perl
+++ b/git-svn.perl
@@ -669,12 +669,14 @@ sub merge_revs_into_hash {
}
sub merge_merge_info {
- my ($mergeinfo_one, $mergeinfo_two) = @_;
+ my ($mergeinfo_one, $mergeinfo_two, $ignore_branch) = @_;
my %result_hash = ();
merge_revs_into_hash(\%result_hash, $mergeinfo_one);
merge_revs_into_hash(\%result_hash, $mergeinfo_two);
+ delete $result_hash{$ignore_branch} if $ignore_branch;
+
my $result = '';
# Sort below is for consistency's sake
for my $branchname (sort keys(%result_hash)) {
@@ -695,6 +697,7 @@ sub populate_merge_info {
my $all_parents_ok = 1;
my $aggregate_mergeinfo = '';
my $rooturl = $gs->repos_root;
+ my ($target_branch) = $gs->full_pushurl =~ /^\Q$rooturl\E(.*)/;
if (defined($rewritten_parent)) {
# Replace first parent with newly-rewritten version
@@ -726,7 +729,7 @@ sub populate_merge_info {
# Merge previous mergeinfo values
$aggregate_mergeinfo =
merge_merge_info($aggregate_mergeinfo,
- $par_mergeinfo, 0);
+ $par_mergeinfo, $target_branch);
next if $parent eq $parents[0]; # Skip first parent
# Add new changes being placed in tree by merge
@@ -769,7 +772,7 @@ sub populate_merge_info {
my $newmergeinfo = "$branchpath:" . join(',', @revsin);
$aggregate_mergeinfo =
merge_merge_info($aggregate_mergeinfo,
- $newmergeinfo, 1);
+ $newmergeinfo, $target_branch);
}
if ($all_parents_ok and $aggregate_mergeinfo) {
return $aggregate_mergeinfo;
diff --git a/t/t9161-git-svn-mergeinfo-push.sh b/t/t9161-git-svn-mergeinfo-push.sh
index 6ef0c0b..1eab701 100755
--- a/t/t9161-git-svn-mergeinfo-push.sh
+++ b/t/t9161-git-svn-mergeinfo-push.sh
@@ -88,7 +88,6 @@ test_expect_success 'check reintegration mergeinfo' '
test "$mergeinfo" = "/branches/svnb1:2-4,7-9,13-18
/branches/svnb2:3,8,16-17
/branches/svnb3:4,9
-/branches/svnb4:5-6,10-12
/branches/svnb5:6,11"
'
--
1.8.2
^ permalink raw reply related [flat|nested] 2+ messages in thread* Re: [PATCH] git-svn: avoid self-referencing mergeinfo
2013-03-30 22:06 [PATCH] git-svn: avoid self-referencing mergeinfo Michael Contreras
@ 2013-04-04 1:31 ` Eric Wong
0 siblings, 0 replies; 2+ messages in thread
From: Eric Wong @ 2013-04-04 1:31 UTC (permalink / raw)
To: Michael Contreras
Cc: git, Bryan Jacobs, Avishay Lavie, Sam Vilain, Junio C Hamano
Michael Contreras <michael@inetric•com> wrote:
> 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.
>
> Signed-off-by: Michael Contreras <michael@inetric•com>
> Reported-by: Avishay Lavie <avishay.lavie@gmail•com>
Acked-by: Eric Wong <normalperson@yhbt•net>
80-column wrapped version pushed to git://bogomips.org/git-svn master
(commit e5ee78e1f0835410a37bfa38e1ff5e1a82f8c7b5)
Will ask Junio to pull unless Sam (our mergeinfo expert) gives a NACK
soon.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2013-04-04 1:32 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-03-30 22:06 [PATCH] git-svn: avoid self-referencing mergeinfo Michael Contreras
2013-04-04 1:31 ` Eric Wong
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox