diff options
Diffstat (limited to 'git-import-orig')
| -rwxr-xr-x | git-import-orig | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/git-import-orig b/git-import-orig index 01a38cc4..9c9255c3 100755 --- a/git-import-orig +++ b/git-import-orig @@ -146,7 +146,10 @@ create it otherwise use --upstream-branch to specify it. print "Merging to %s" % (options.debian,) gitCheckoutMaster() gitShowBranch() - gitPullUpstream() + try: + gitPullUpstream() + except gbpc.CommandExecFailed: + raise GbpError, """Merge failed, please resolve and run "dch -v %s-1".""" % version gbpc.Dch("%s-1" % (version,), 'New Upstream Version')() except gbpc.CommandExecFailed: raise GbpError, "Import of %s failed" % archive |