X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=blobdiff_plain;f=debian%2Fchangelog;h=18a9cfe7f852ac4748be53b52bed23570e69a413;hp=96a9e6252980ffb8ecbab67624bba4c0c8c8220e;hb=6a552157942a5b23579655f44f9b23a88041f53e;hpb=1066c6442bc1471d440ac86711250d825b5ddc2c

diff --git a/debian/changelog b/debian/changelog
index 96a9e625..18a9cfe7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,66 @@
-dgit (5.6~) unstable; urgency=medium
+dgit (5.9+exp1) experimental; 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.
+  * git-debrebase, Dgit.pm, git: some internal reorganisation to
+    support git-debrebase changes.
+  * dgit-downstream-dsc(7): New manpage.  Closes:#842643,#851194.
+  * git-debrebase(5): Document best gitk options.  Closes:#901927.
+
+ -- Ian Jackson <ijackson@chiark.greenend.org.uk>  Thu, 12 Jul 2018 13:37:12 +0100
+
+dgit (5.8) unstable; urgency=medium
+
+  Bugfixes:
+  * dgit, git-debrebase: Properly make patches even if an awkward
+    .gitignore ignores the things in debian/patches.  Closes:#903130.
+  * git-debrebase status: Fix commit reporting.  Closes:903131.
+  * git-debrebase new-upstream: Add a -1 revision if the user
+    didn't supply one.  Closes:#903127.
+  * 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
+
+  New feature:
+  * dgit checkout: new subcommand.  Closes:#878443.
+  * dgit: Check that entirely-new uploads to Debian are not
+    source-only-uploads, as those are REJECTed.  Closes:#801435.
+
+  Bugfixes:
+  * dgit(7): Mention git-debrebase and gbp pq alongside git-dpm,
+    in the comment about handling patch stacks.
+  * dgit update-vcs-git: Honour --package properly.
+  * test suite: Always pass LC_COLLATE=C to sort(1).  Closes:#903006.
+  * test suite: Fix trustingpolicy-replay & dput-ng.  Closes:#903007.
+  * test suite: Test dput-ng compatibility.
+
+ -- Ian Jackson <ijackson@chiark.greenend.org.uk>  Thu, 05 Jul 2018 15:02:21 +0100
+
+dgit (5.6) unstable; urgency=medium
 
   * Merge the experimental branch containing the fianl
-    version of the test suite gnupg workarounds.
+    version of the test suite gnupg workarounds.  Empirically,
+      - The tests now pass (most of the time, at least) in
+        current Debian unstable, whereas 5.5's fail utterly.
+      - There is still occasional lossage.  So when running tests
+        in a loop (eg to test ever commit), it is still good to set
+        DGIT_TEST_RETRY_COUNT=3 (say).
 
   * test suite: Test that manpages format with only expected warnings.
 
- --
+ -- Ian Jackson <ijackson@chiark.greenend.org.uk>  Sun, 01 Jul 2018 00:41:20 +0100
 
 dgit (5.5+exp9) experimental; urgency=medium