pseudomerge: When generating pseudomerge in quilt split brain mode due to --overwrite...

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

diff --git a/debian/changelog b/debian/changelog
index f88bc3867cc3606fe749129cce35c5934cd38432..88ec5bbd1b9c26fe14967c26460d5a517e2aad9e 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
 dgit (2.3~) unstable; urgency=medium
 
-  * 
+  * When generating pseudomerge in quilt split brain mode due to
+    --overwrite, actually include the version number in the commit
+    message.
 
  --
 

diff --git a/dgit b/dgit
index 3b847d7e6c649cd60d4502714c57d0eaa4f831dd..bc4d7c3e55bb2f1f09b64b6c1dd1d86e42ca6f7a 100755 (executable)
--- a/dgit
+++ b/dgit
@@ -2912,7 +2912,7 @@ sub splitbrain_pseudomerge ($$$$) {
        $clogp, $dgitview, $archive_hash, $i_arch_v,
        "dgit --quilt=$quilt_mode",
        (defined $overwrite_version ? <<END_OVERWR : <<END_MAKEFF);
-Declare fast forward from $overwrite_version
+Declare fast forward from $i_arch_v->[0]
 END_OVERWR
 Make fast forward from $i_arch_v->[0]
 END_MAKEFF