diff options
| author | Andrew Myrick <amyrick@apple.com> | 2010-01-06 16:25:22 -0800 |
|---|---|---|
| committer | Eric Wong <normalperson@yhbt.net> | 2010-01-23 03:23:03 -0800 |
| commit | 41c01693ac13846c73a31c8f5c3a60206e1643be (patch) | |
| tree | a21ce5371bb47d706c60a4c48d2a1467e8150f5a /builtin-stripspace.c | |
| parent | 1cef6500a9edc7997bd0aa4cd1f739f5106ab0a9 (diff) | |
| download | git-41c01693ac13846c73a31c8f5c3a60206e1643be.tar.gz | |
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>
Diffstat (limited to 'builtin-stripspace.c')
0 files changed, 0 insertions, 0 deletions