git.99rst.org / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 1cef650)
git-svn: handle merge-base failures
authorAndrew Myrick <redacted>
Thu, 7 Jan 2010 00:25:22 +0000 (16:25 -0800)
committerEric Wong <redacted>
Sat, 23 Jan 2010 11:23:03 +0000 (03:23 -0800)
commit41c01693ac13846c73a31c8f5c3a60206e1643be
treea21ce5371bb47d706c60a4c48d2a1467e8150f5atree | snapshot
parent1cef6500a9edc7997bd0aa4cd1f739f5106ab0a9commit | diff
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 <redacted>
Acked-by: Sam Vilain <redacted>
Acked-by: Eric Wong <redacted>
git-svn.perl diff | blob | history
git clone https://git.99rst.org/PROJECT