X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=blobdiff_plain;f=debian%2Fchangelog;h=e85192f8be70adbd6b43a97fb4778fdddda754f1;hp=e82332f00d02c6e98425f779d1985e7ee9c7c085;hb=1496d006a79eeeed4db2a444e3ad8b7bc1f7e4c1;hpb=ba5d46b8844b347f9dd54657b818c5017491bd13

diff --git a/debian/changelog b/debian/changelog
index e82332f0..e85192f8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,68 @@
-dgit (3.12~) unstable; urgency=medium
+dgit (4.2~) experimental; urgency=medium
+
+  Documentation improvements:
+  * dgit-maint-merge(7): many updates.  [Sean Whitton]
+    Closes:#864873,#878433.
+  * dgit-*(7): Mention first upload trick.  [Andrew Shadura,
+    Sean Whitton]  Closes:#856402.
+
+  Minor fixes:
+  * Fix grammar error in 4.1 changelog entry. [Sean Whitton]
+  * Remove some whitespace "errors". [Sean Whitton]
+
+  Test suite:
+  * dpkgsourceignores-docs: Correct restriction (so autopkgtest
+    won't try to run it).
+
+ --
+
+dgit (4.1) experimental; urgency=medium
+
+  Important improvements to dgit:
+  * Support for `git worktree' worktrees.  There may still be
+    bugs; the tests for this are not very comprehensive.  And
+    worktrees on different filesystems may not work; that's a
+    matter for the future.  Closes:#868515.
+  * Change the dpkg-source -i argument to exclude exactly the right
+    set of things.  (Sadly this is not a simple rune.)
+
+  Other improvements to dgit:
+  * New print-dpkg-source-ignores option to print the big rune
+    you need to pass to dpkg-source to make it work exactly right.
+  * Properly shell-quote the --git-builder argument to gbp.
+
+  Documentation:
+  * dgit-user(7): Provide information about how to use sbuild.
+    Quite ugly due to #868527.  Closes:#868526.
+  * dgit-user(7): Fixed example rune to use curl (which prints
+    to stdout, as the rune expects).  [reported by Simon Tatham]
+
+  Minor improvements:
+  * Do not leave many clog-* files in .git/dgit.
+
+  Internal changes:
+  * using-these: New script to help with ad-hoc-testing.
+  * Refactoring in preparation for push-source [Sean Whitton].
+
+  Test suite:
+  * sbuild-gitish: New test case to check running sbuild from git
+  * Work around gnupg agent connection races by having our stunt
+    gpg wrapper simply try running gpg again, once, if it exits 2.
+    This does not fully suppress the bug but it does significantly reduce
+    the probability.
+  * Other tests for new features.
+  * Various refactoring.
+
+ -- Ian Jackson <ijackson@chiark.greenend.org.uk>  Mon, 14 Aug 2017 09:31:03 +0100
+
+dgit (4.0) experimental; urgency=low
+
+  * dgit: --deliberately-not-fast-forward works properly in
+    split view quilt modes (suppressing the pseudomerge).
+
+ -- Ian Jackson <ijackson@chiark.greenend.org.uk>  Sun, 12 Feb 2017 22:22:31 +0000
+
+dgit (3.12) unstable; urgency=high
 
   Important bugfixes to dgit:
   * Pass --no-renames to git diff-tree -z, avoiding potential trouble.
@@ -25,7 +89,7 @@ dgit (3.12~) unstable; urgency=medium
   * quilt fixup: Check we can delete files with funny modes
   * quilt fixup: Check that funny changes are represented properly
 
- --
+ -- Ian Jackson <ijackson@chiark.greenend.org.uk>  Sun, 16 Jul 2017 21:36:24 +0100
 
 dgit (3.11~deb9u1) stretch; urgency=high