dgit: quilt fixup: Do not suggest quilt modes if we see gdr

[dgit.git] / debian / changelog

diff --git a/debian/changelog b/debian/changelog
index 3fe4ea8c08454765d7bcb92f73ea6c37c501d39d..a370753de38f8ce247d6cf42eb2dfa3d299ebfa8 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -26,6 +26,12 @@ 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.
+  * dgit: Do not suggest --quilt modes if quilt fixup "stopped at"
+    a commit made by git-debrebase.  Closes:#906197.
 
  --