X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=debian%2Fchangelog;h=af4893b1eb9d8bc13ace2c638adf1d448bb12d04;hb=dc2d5ffb3627335e6522ddb7bf526880dc699762;hp=99e724d00609a33b5d6e2839c6b55e0537b1603f;hpb=63f314691709644c0fb60c9ae4942f75714e4255;p=dgit.git

diff --git a/debian/changelog b/debian/changelog
index 99e724d0..af4893b1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,13 +1,40 @@
-dgit (2.4~) unstable; urgency=low
+dgit (2.5~) unstable; urgency=medium
 
+  Substantive changes:
+  * Do not crash in split brain quilt modes when the two brains are
+    actually identical.  (Eg --quilt=gbp with no patches.)  Closes:#841770.
+  * Switch to new archive/ tag format by default, even in
+    non-split-brain mode.
+  * Provide --gbp and --dpm as aliases for --quilt=gbp and --quilt=dpm.
+
+  Documentation:
+  * dgit-maint-merge(7): New tutorial manpage from Sean Whitton.
+
+  Test suite:
+  * Introduce setup/gnupg, to help work around gnupg2 bug #841143
+    and improve performance by amortising gnupg migration cost.
+  * Various bugfixes.
+
+ --
+
+dgit (2.4) unstable; urgency=low
+
+  Bugfixes:
+  * split brain cache: Fix a wrong implicit reference to $_.
+    Closes:#841383.
+  * split brain cache: Make sure to write reflog entries for cache updates
+    even if the eventual tree (and therefore commit) is the same.
+    Otherwise, after updating dgit, the cache might have the right answer
+    but not be refreshed even by a build.
   * dgit gbp-build: No longer invent a --git-debian-branch option.
     Usually the user is a maintainer using split brain, and we should rely
     on their own gbp configuration to specify the right check.
     Closes:#841100.
-  * split brain cache: Fix a wrong implicit reference to $_.
-    Closes:#841383.
 
- --
+  Minor docs fix:
+  * dgit(1): Document which --ch: options are a good idea.
+
+ -- Ian Jackson <ijackson@chiark.greenend.org.uk>  Thu, 20 Oct 2016 16:31:54 +0100
 
 dgit (2.3) unstable; urgency=low