test suite: Test dgit branch_is_gdr walker on a merge resolution Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
git-debrebase: Merges: Enable with command-line option instead of env var Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
git-debrebase: merge: gdr-merge test: sort out section comments Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
git-debrebase: merge: test: Introduce t-merge-conflicted-* NFC Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
git-debrebase: merge: test: Drop stuff cloned from gdr-viagit We don't much are about this here. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
git-debrebase: merge: test suite: Use t-ref-same-start This is better than t-gdr-good laundered because (i) it is faster (ii) it checks that the second laundry was a no-op (and did not rewrite unnecessarily). Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
git-debrebase: merge: test suite: test avoiding re-merge of debian/ Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
git-debrebase: merge: test suite: Do a bit more testing We can now call t-gdr-good laundered, because it works. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
git-debrebase: merge: Comment about laundry of merge of unstitched I have concluded that this is not a problem avoidable by git-debrebase, and that any trouble will be tolerable (at least, not data loss). The user should try to avoid doing this. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
git-debrebase: merge: test suite: Test both with and without `after' Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
git-debrebase: test suite: New gdr-merge test This still has a lot of xxx's, but as it is right now it passes, despite all the bugs. This seems like a reasonable baseline for more work. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>