From b5332638ab5f8887bf69bc457f06c17c68e45ce2 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Mon, 20 Aug 2018 01:24:34 +0100 Subject: [PATCH] dgit(7): Mention bad origs as possible cause of quilt fixup failure And document our error message changes. Signed-off-by: Ian Jackson --- debian/changelog | 4 ++++ dgit.7 | 6 ++++++ 2 files changed, 10 insertions(+) diff --git a/debian/changelog b/debian/changelog index 3fe4ea8c..b4fe0cbf 100644 --- a/debian/changelog +++ b/debian/changelog @@ -26,6 +26,10 @@ dgit (6.7~) unstable; urgency=medium * git-debrebase: Provide hints for unprocessable commits, depending on the apparent branch ffq state, including possible suggestion to use convert-from-*. Closes:#905005. Closes:#905279. + * dgit: Mention bad origs as possible cause of quilt fixup failure, + in both dgit(7) and in error messages. No longer suggest + --quilt=smash or dpkg-source --commit in the error message. + Closes:906196. -- diff --git a/dgit.7 b/dgit.7 index b623d8cf..27d0998d 100644 --- a/dgit.7 +++ b/dgit.7 @@ -377,6 +377,12 @@ that are not representable by dpkg-source (such as some mode changes). Or maybe you just forgot a necessary .B --quilt= option. + +Finally, +this problem can occur if you have provided +Debian git tooling such as git-debrebase, git-dpm or git-buildpackage +with upstream git commit(s) or tag(s) +which are not 100% identical to your orig tarball(s). .SH SPLIT VIEW QUILT MODE When working with git branches intended for use with the `3.0 (quilt)' source format -- 2.30.2