X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=debian%2Fchangelog;h=b1e6792e637c8dc1a8481f0f97e46b4eff226b78;hb=3471e600b5d2b3910a46c37dbd0969bbf304a559;hp=96e495e2641c09bf3c63a98459c9441400ae8e7b;hpb=d1d2476d690733d7a42ad4bde76b08ad73ac299e;p=dgit.git

diff --git a/debian/changelog b/debian/changelog
index 96e495e2..b1e6792e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,36 @@
-dgit (5.9~) unstable; urgency=medium
+dgit (5.10~) unstable; urgency=medium
+ 
+  * Merge the experimental branch.
+  * test suite: Drop a couple of useless test log output lines.
+ 
+ --
+ 
+dgit (5.9+exp4) experimental; urgency=medium
 
-  * 
+  * test suite: Use  dch -r -D sid ''  not  dch -r sid.  Closes:#903441.
+  * test suite: Save a tarball of much of the working area of each test
+    in $AUTOPKGTEST_ARTIFACTS.
+  * Separate changelog entries for the following test attempts
+    in experimental have been elided:
+      dgit (5.9+exp3) experimental; urgency=medium
+      dgit (5.9+exp2) experimental; urgency=medium
+      dgit (5.9+exp1) experimental; urgency=medium
 
- --
+ -- Ian Jackson <ijackson@chiark.greenend.org.uk>  Thu, 12 Jul 2018 13:45:07 +0100
+
+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