X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=blobdiff_plain;f=debian%2Fchangelog;h=380165c0ee4c862e734960a8cbb243fbb11642d7;hp=4209e71a43ee3ab9ac69b1943f8848806458ae4a;hb=3d15c2615f907ea17f09ebd9ee1970c9d05eeb96;hpb=b363aeb4b0228eff6ad85229946feeb3b4d92b77

diff --git a/debian/changelog b/debian/changelog
index 4209e71a..380165c0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,38 @@
+dgit (4.2~) experimental; urgency=medium
+
+  Documentation improvements:
+  * dgit(1): Add a bit more rationale (polemic, even).  Closes:#874221.
+  * Recommend mk-build-deps rather than apt-get build-dep.
+    Suggestion from Nikolaus Rath.  Closes:#863361.
+  * 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:
+  * When source discrepancy involves file mode changes, report them
+    specially.  Closes:#886442.
+  * In split brain mode, with unexpected diffs, print dgit view
+    commitid in suggested diff rune.  (HEAD is wrong.)  Closes:#886443.
+  * Fix message about missing quilt cache entry to refer to
+    HEAD rather than tree, since dgit needs a commit.  Closes:#884646.
+  * Fix grammar error in 4.1 changelog entry. [Sean Whitton]
+  * Remove some whitespace "errors". [Sean Whitton]
+
+  Packaging:
+  * Remove dependency alternative on realpath (package last existed in
+    Debian wheezy).  Closes:#877552.
+
+  Test suite:
+  * dpkgsourceignores-docs: Correct restriction (so autopkgtest
+    won't try to run it).
+  Test suite:
+  * Additional workarounds for gnupg races (#868550) including
+    retrying each individual test once, and more sophisticated
+    wrapper for gpg (with locking and, sometimes saves stdin).
+
+ --
+
 dgit (3.13) unstable; urgency=high
 
   Important bugfixes to dgit:
@@ -9,6 +44,52 @@ dgit (3.13) unstable; urgency=high
 
  -- Ian Jackson <ijackson@chiark.greenend.org.uk>  Sun, 22 Oct 2017 17:51:12 +0100
 
+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: