git-import-orig: more specific error message, when the merge merge fails

(Closes: #423036)

diff --git a/debian/changelog b/debian/changelog
index f8ac3e8eefd66da82d7ec13f5a71557e88f4cb7c..39df9fbf79c0b8b72d07b16f1b46350e7d0e9058 100644 (file)
--- 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 01a38cc4e14a30e5f1ee15d41ed888ca7a78f4d0..9c9255c3219a017829e1bc3535ce120ae0d7d429 100755 (executable)
--- 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