Split brain: Make quiltify_trees_differ cleverer

[dgit.git] / debian / changelog

diff --git a/debian/changelog b/debian/changelog
index d4ce80656b078b60e031a80fc64a124f0899a888..30db5c982766c157fb1010b32a1aeec5979477ed 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -12,7 +12,7 @@ dgit (1.5~~) unstable; urgency=medium
   * dgit sbuild: check that the set of .changes files found is as we
     expect, before calling mergechanges.
   * dgit sbuild: Rename the used-up .changes files to `.inmulti' to
-    avoid accidental  use of the wrong one (by software, or by users).
+    avoid accidental use of the wrong one (by software, or by users).
   * dgit sbuild: Check that the binary .changes file doesn't contain a
     .dsc.
   * Introduce --rm-old-changes to delete previous builds' changes files.
@@ -22,6 +22,13 @@ dgit (1.5~~) unstable; urgency=medium
     Instead, insist on a single one.
   * dgit sbuild no longer deletes extranious .changes files; instead
     we rely on --rm-old-changes, or failing that, fail early.
+  * When doing quilt linearisation, treat upstream .gitignores not
+    in the toplevel the same way we treat ones in the toplevel.
+
+  Infrastructure:
+  * Better error handling in dgit-repos-policy-debian.
+  * dgit-repos-policy-debian.: fix git-cat-file-handling with multiple
+    taints in db (!).
 
   Documentation:
   * Document the dgit-distro.DISTRO.quilt-mode config setting.
@@ -53,6 +60,8 @@ dgit (1.5~~) unstable; urgency=medium
   * Test quilt single-debian-patch.
   * Provide `tartree-edit gitfetchinfo' etc. to help with comparing
     different test case git working tree tarballs.
+  * Test dgit-repos-policy-debian with multiple (identical, as it happens)
+    existing taints.
 
  --