From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sun, 19 Aug 2018 18:59:41 +0000 (+0100)
Subject: git-debrebase: convert-from-gbp; on stitch failure, clarify message
X-Git-Tag: archive/debian/6.7~34
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=commitdiff_plain;h=6320a38e58a33f648f701d43946831fc166fab6f

git-debrebase: convert-from-gbp; on stitch failure, clarify message

Clarify what the preceding failure messages mean, and what the
consequences are.

This is part of #906641.

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

diff --git a/git-debrebase b/git-debrebase
index 6abc86da..eabf5ada 100755
--- a/git-debrebase
+++ b/git-debrebase
@@ -2489,7 +2489,11 @@ END
     if (!$previous_dgit_view) {
 	$@ =~ s/^\n+//;
 	chomp $@;
-	print STDERR "cannot stitch in dgit view: $@\n";
+	print STDERR <<END;
+Cannot confirm dgit view: $@
+Failed to stitch in dgit view (see messages above).
+dgit --overwrite will be needed on the first dgit push after conversion.
+END
     }
 
     snags_maybe_bail_early();