dgit(7): Mention bad origs as possible cause of quilt fixup failure

[dgit.git] / debian / changelog

diff --git a/debian/changelog b/debian/changelog
index 3f18752a52b9aa7e52c85a79b00dcd58e8486040..b4fe0cbf6b24577a5acd90f909461cb245795b48 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -15,6 +15,21 @@ dgit (6.7~) unstable; urgency=medium
     both stitched and laundered.  Closes:#905975.
   * git-debrebase: convert-from-*: Snag on patches in d/patches which are
     not in series, because they will be deleted.  Closes:#904997.
+  * changelog: Add close note for #905400 to changelog entry for 6.5.
+  * git-debrebase: convert-from-gbp: Improve messages.  Closes:#906641.
+  * git-debrebase: Highly experimental merge resolution support,
+    enabled only with special command line option.
+  * git-debrebase: Check in convert-from-* whether ffq-prev or
+    debrebase-last indicate that we are already in gdr format.
+  * git-debrebase: convert-from-*: leave debrebase-last refs to
+    hint to everyone that this is now a gdr branch.
+  * 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.
 
  --
 
@@ -33,7 +48,7 @@ dgit (6.5) unstable; urgency=medium
   * git-debrebase: New subcommand `scrap'.  Closes:#905063.
 
   git-debrebase error handling improvements:
-  * git-debrebase: Properly reject bare dgit dsc imports
+  * git-debrebase: Properly reject bare dgit dsc imports.  Closes:905400.
   * git-debrebase: Improve some error message formatting.
   * git-debrebase: Check for git-rebase in progress and abort most operations.