Andrew Myrick 41c01693ac 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>

2010-01-23 03:23:03 -08:00

168 KiB

Executable File

Raw Blame History

View Raw