X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=debian%2Fchangelog;h=b0a4401dfa83d7a6149b7ecf24552a6bea754193;hb=c7b1835adf29b4dbacdb9e78c4b201a1b895a183;hp=ba60bdedeb356f64cbd21c725e592eb8813cf60f;hpb=2a7411655b752fddfc8955f2967dbdc504d50451;p=dgit.git

diff --git a/debian/changelog b/debian/changelog
index ba60bded..b0a4401d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,50 @@
-dgit (5.7~) unstable; urgency=medium
+dgit (5.10~) unstable; urgency=medium
+ 
+  * Merge the experimental branch.
+ 
+ --
+ 
+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
+
+  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.
@@ -13,7 +59,7 @@ dgit (5.7~) unstable; urgency=medium
   * 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