git-debrebase: test suite: introduce t-some-changes

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

diff --git a/tests/tests/gdr-edits b/tests/tests/gdr-edits
index f5ca2a434b986106f2d2a6f1dab7f2ac94a0706f..cff33b1d1e791506ac209d2078fbab081d06f570 100755 (executable)
--- a/tests/tests/gdr-edits
+++ b/tests/tests/gdr-edits
@@ -8,9 +8,36 @@ t-setup-import gbp2gdr
 
 cd $p
 
+v=2.0-3
+t-dch-commit -v $v -m testing
+
 t-git-debrebase analyse |tee ../anal.1
 cat ../anal.1
 
-: xxx
+t-some-changes edits
+
+t-dch-commit -r sid
+
+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
+
+t-dgit push-source
+
+t-gdr-branch-structure pushed
+
+: 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