git-debrebase: test suite: note we've added a test

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

diff --git a/tests/tests/gdr-edits b/tests/tests/gdr-edits
index 70735e9e3991e0ec7b8c449c3086deedeb4f9600..776c91830741e3a4adf2a195396f9b5af538fd9d 100755 (executable)
--- a/tests/tests/gdr-edits
+++ b/tests/tests/gdr-edits
@@ -8,36 +8,28 @@ 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
 
 t-git-debrebase
-
-git diff t.before -- ':.' ':!debian/patches'
-
-t-gdr-branch-structure laundered
+t-gdr-good laundered
 
 t-git-debrebase stitch --prose=wombat
+t-gdr-good stitched
 
-: todo 'check that all is still well'
+t-dgit push-source
+t-gdr-good 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'