Merge branch 'stable' into HEAD

[dgit.git] / debian / changelog

diff --git a/debian/changelog b/debian/changelog
index f91290ea44a56a71afaa8ebfd3a0ee0edaf947f2..5978c663a65e5630806fba3d6c7dd49f46320f06 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,18 @@
-dgit (3.12~) unstable; urgency=medium
+dgit (4.1~) experimental; urgency=medium
+
+  Internal changes:
+  * using-these: New script to help with ad-hoc-testing.
+
+ --
+
+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.
@@ -8,6 +22,8 @@ dgit (3.12~) unstable; urgency=medium
   * dgit import: Defend against broken symlinks in ..
   * dgit import: Right error message for missing files in ..
   * dgit import: Avoid making broken symlinks in ..
+  * quilt fixup: Tolerate deletion of executable files.
+  * quilt fixup: Tolerate symlink creation (make patches).  Closes:#857382.
 
   Important bugfixes to other components:
   * dgit-repos-server: Do not reject commits with no author/committer
@@ -20,8 +36,10 @@ dgit (3.12~) unstable; urgency=medium
   * t-report-fail: print $PWD as part of failure message.
   * import-dsc: Test missing files, particularly in ..
   * run git gc on tests/worktrees/example_1.0.tar.
+  * 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