Split brain: Make quiltify_trees_differ cleverer

[dgit.git] / debian / changelog

diff --git a/debian/changelog b/debian/changelog
index 21726d084e944345e45e65929715f29b27f8dfd7..30db5c982766c157fb1010b32a1aeec5979477ed 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -22,6 +22,8 @@ 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.
@@ -58,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.
 
  --