| commit | 41c01693ac13846c73a31c8f5c3a60206e1643be | |
| author | Andrew Myrick <amyrick@apple.com> | |
| Thu, 7 Jan 2010 00:25:22 +0000 (6 16:25 -0800) | ||
| committer | Eric Wong <normalperson@yhbt.net> | |
| Sat, 23 Jan 2010 11:23:03 +0000 (23 03:23 -0800) | ||
| tree | a21ce5371bb47d706c60a4c48d2a1467e8150f5a | treesnapshot (tar.gz zip) |
| parent | 1cef6500a9edc7997bd0aa4cd1f739f5106ab0a9 | commitdiff |
git-svn: handle merge-base failures
Change git-svn to warn and continue when merge-base fails while processing svn
merge tickets.
merge-base can fail when a partial branch is created and merged back to trunk
in svn, because it cannot find a common ancestor between the partial branch and
trunk.
Signed-off-by: Andrew Myrick <amyrick@apple.com>
Acked-by: Sam Vilain <sam@vilain.net>
Acked-by: Eric Wong <normalperson@yhbt.net>
Change git-svn to warn and continue when merge-base fails while processing svn
merge tickets.
merge-base can fail when a partial branch is created and merged back to trunk
in svn, because it cannot find a common ancestor between the partial branch and
trunk.
Signed-off-by: Andrew Myrick <amyrick@apple.com>
Acked-by: Sam Vilain <sam@vilain.net>
Acked-by: Eric Wong <normalperson@yhbt.net>
| git-svn.perl | diffblobblamehistory |