git-debrebase: test: check branch structure, more

[dgit.git] / tests / tests / gdr-edits

diff --git a/tests/tests/gdr-edits b/tests/tests/gdr-edits
index 1d74da3b54d1961983bdd06322cead0ebd6ae420..ffb3305126257c7ba80fa05a860e66f6c1480488 100755 (executable)
--- a/tests/tests/gdr-edits
+++ b/tests/tests/gdr-edits
@@ -24,4 +24,22 @@ for f in debian/zorkmid src.c; do
 done
 git commit -m 'MIXED add boths'
 
+git tag t.before
+
+t-git-debrebase
+
+git diff t.before -- ':.' ':!debian/patches'
+
+t-gdr-branch-structure laundered
+
+t-git-debrebase stitch --prose=wombat
+
+t-gdr-branch-structure stitched
+
+: todo 'more tests: convert dgit import new upstream version'
+: todo 'more tests: convert dgit import same upstream version'
+: todo 'more tests: other maint updated, we must fetch'
+: todo 'more tests: other maint updated, alert divergence'
+: todo 'more tests: nmu divergence'
+
 t-ok