commit 6a2009e7f34148a737d8832887dcd491905017be
author Tuomas Suutari <tuomas.suutari@gmail.com> Mon Feb 22 20:12:53 2010 +0200
committer Eric Wong <normalperson@yhbt.net> Fri Feb 26 01:30:23 2010 -0800
tree 843d8292cd9b077ebaf890c30a654561b88f024b
parent 9560808f2ef5a34d2a69c454cfa6003a2f8467cb

git-svn: Fix discarding of extra parents from svn:mergeinfo

If parent J is an ancestor of parent I, then parent J should be
discarded, not I.

Note that J is an ancestor of I if and only if rev-list I..J is emtpy,
which is what we are testing here.

Signed-off-by: Tuomas Suutari <tuomas.suutari@gmail.com>
Acked-by: Eric Wong <normalperson@yhbt.net>

git-svn.perl

diff --git a/git-svn.perl b/git-svn.perl
index 265852f..ed96a03 100755
--- a/git-svn.perl
+++ b/git-svn.perl
@@ -3273,7 +3273,7 @@
 					"$new_parents[$i]..$new_parents[$j]",
 				       );
 				if ( !$revs ) {
-					undef($new_parents[$i]);
+					undef($new_parents[$j]);
 				}
 			}
 		}