diff options
| author | Guido Guenther <agx@sigxcpu.org> | 2007-05-16 00:06:42 +0200 |
|---|---|---|
| committer | Guido Guenther <agx@bogon.sigxcpu.org> | 2007-05-16 00:06:42 +0200 |
| commit | d5664627241d5e91de8b0a151d508a32b946c503 (patch) | |
| tree | c06b1b50af461220ab456178278a4100066b21ec | |
| parent | c034a511b4135f4423beb68acda459805fb393e5 (diff) | |
git-import-orig: more specific error message, when the merge merge failsdebian/0.2.29
(Closes: #423036)
| -rw-r--r-- | debian/changelog | 7 | ||||
| -rwxr-xr-x | git-import-orig | 5 |
2 files changed, 11 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog index f8ac3e8e..39df9fbf 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +git-buildpackage (0.2.29) unstable; urgency=low + + * git-import-orig: more specific error message, when the merge merge fails + (Closes: #423036) + + -- Guido Guenther <agx@sigxcpu.org> Tue, 15 May 2007 23:55:07 +0200 + git-buildpackage (0.2.28) unstable; urgency=low * git-import-orig: support import of tar.bz2 (Closes: #423254) 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 |