diff options
-rw-r--r-- | debian/changelog | 4 | ||||
-rw-r--r-- | dgit.7 | 6 |
2 files changed, 10 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog index 3fe4ea8..b4fe0cb 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. -- @@ -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 |