chiark / gitweb /
git-debrebase: test suite: gdr-diverge-nmu: more work, still need to check
authorIan Jackson <ijackson@chiark.greenend.org.uk>
Sat, 17 Feb 2018 22:52:36 +0000 (22:52 +0000)
committerIan Jackson <ijackson@chiark.greenend.org.uk>
Sat, 16 Jun 2018 15:06:58 +0000 (16:06 +0100)
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
tests/tests/gdr-diverge-nmu

index 94fd44a..6d14bba 100755 (executable)
@@ -51,4 +51,16 @@ git merge --squash -m 'Incorporate NMU' dgit/dgit/sid
 git rm -rf debian/patches
 git commit -m 'Incorporate NMU'
 
+git merge -s ours -m 'Declare incorporate NMU' dgit/dgit/sid
+
+: 'right, how are we'
+
+t-git-next-date
+
+t-git-debrebase
+t-gdr-good laundered
+
+t-git-debrebase stitch
+t-gdr-good stitched
+
 t-ok