| commit | 6a2009e7f34148a737d8832887dcd491905017be | |
| author | Tuomas Suutari <tuomas.suutari@gmail.com> | |
| Mon, 22 Feb 2010 18:12:53 +0000 (22 20:12 +0200) | ||
| committer | Eric Wong <normalperson@yhbt.net> | |
| Fri, 26 Feb 2010 09:30:23 +0000 (26 01:30 -0800) | ||
| tree | 843d8292cd9b077ebaf890c30a654561b88f024b | treesnapshot (tar.gz zip) |
| parent | 9560808f2ef5a34d2a69c454cfa6003a2f8467cb | commitdiff |
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>
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 | diffblobblamehistory | |
| t/t9151-svn-mergeinfo.sh | diffblobblamehistory |