From 71350fe30f7449b24dc2884b42cc5ff50a2bf84e Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Sat, 4 Jun 2016 15:04:28 +0100 Subject: Split brain: Make quiltify_trees_differ cleverer Have it be able to explain what was different, by returning a bitmask. Update the call sites. Incidentally, fix a bug where .gitignores other than in the toplevel would not be ignored when they ought to have been. --- debian/changelog | 2 ++ 1 file changed, 2 insertions(+) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 5842873..30db5c9 100644 --- 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. -- cgit v1.2.3