git-debrebase: test suite: gdr-diverge-nmu: more work, still need to check

[dgit.git] / tests / tests / gdr-diverge-nmu

diff --git a/tests/tests/gdr-diverge-nmu b/tests/tests/gdr-diverge-nmu
index 94fd44a6da075bfec8e36170d1c5ae0cc5128625..6d14bba1dd1c2750fd6eb97c2f8b9b3e8826fc2b 100755 (executable)
--- a/tests/tests/gdr-diverge-nmu
+++ b/tests/tests/gdr-diverge-nmu
@@ -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