From 12da50e85e2fe58f537d8eb1c3b06f1377e373c9 Mon Sep 17 00:00:00 2001
From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Tue, 18 Oct 2016 01:33:12 +0100
Subject: [PATCH] pseudomerge: When generating pseudomerge in quilt split brain
 mode due to --overwrite, actually include the version number in the commit
 message.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
---
 debian/changelog | 4 +++-
 dgit             | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index f88bc386..88ec5bbd 100644
--- 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 3b847d7e..bc4d7c3e 100755
--- 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
-- 
2.30.2