git-debrebase convert-from-gbp: Add ffq check

[dgit.git] / debian / changelog

diff --git a/debian/changelog b/debian/changelog
index f9e2afae17364303afbf0465280152e771ac0a23..0afe46a21f64110dfdfc194f109d8e78baffa294 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,14 @@
-dgit (5.8~) unstable; urgency=medium
+dgit (5.9~) unstable; urgency=medium
+
+  * git-debrebase convert-from-gbp: Look for dgit-generated tags so we can
+    usually make the new branch ff of the dgit view.  Closes:#903132.
+  * git-debrebase convert-from-gbp: Check that the result will not
+    count as having diverged.  This will usually turn failures to make
+    the ff pseudomerge into -fdiverged.  Related to #903132.
+
+ --
+
+dgit (5.8) unstable; urgency=medium
 
   Bugfixes:
   * dgit, git-debrebase: Properly make patches even if an awkward
@@ -9,7 +19,7 @@ dgit (5.8~) unstable; urgency=medium
   * git-debrebase: Improve grammar if one blocking snag.
   * dgit(1): Unscramble push[-source] descriptions.  Closes:#903116.
 
- --
+ -- Ian Jackson <ijackson@chiark.greenend.org.uk>  Sun, 08 Jul 2018 11:42:41 +0100
 
 dgit (5.7) unstable; urgency=medium