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 bab3a3dce67477eae5dd5f580c6c6ae199a70e40..cff33b1d1e791506ac209d2078fbab081d06f570 100755 (executable)
--- a/tests/tests/gdr-edits
+++ b/tests/tests/gdr-edits
@@ -8,21 +8,15 @@ 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
 
-echo >>debian/zorkmid '// debian'
-git add debian/zorkmid
-git commit -m 'DEBIAN add zorkmid'
-
-echo >>src.c '// upstream'
-git commit -a -m 'UPSTREAM edit src.c'
+t-some-changes edits
 
-for f in debian/zorkmid src.c; do
-       echo '// both!' >>$f
-       git add $f
-done
-git commit -m 'MIXED add boths'
+t-dch-commit -r sid
 
 git tag t.before
 
@@ -30,4 +24,20 @@ 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