X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=tests%2Ftests%2Fgdr-edits;h=d4e2a85a5bcc64644959b6bcb94eb60dab34ceea;hb=ff5714f882789163d1a0ff46d737e3e1f6e0e005;hp=ffb3305126257c7ba80fa05a860e66f6c1480488;hpb=bdf0c98adee09e8950bf2f04737308e7746a772a;p=dgit.git

diff --git a/tests/tests/gdr-edits b/tests/tests/gdr-edits
index ffb33051..d4e2a85a 100755
--- a/tests/tests/gdr-edits
+++ b/tests/tests/gdr-edits
@@ -8,33 +8,26 @@ 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
 
-t-gdr-branch-structure stitched
+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'