X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=tests%2Ftests%2Fgdr-edits;h=bb6c8d15051248f16ed7092945df77ca469c4c5e;hb=557f90d88992e61580113baa2e4da0b4427d7cb4;hp=bab3a3dce67477eae5dd5f580c6c6ae199a70e40;hpb=a978592a6db863d539e0ec66c2a6b5fd9d59e96b;p=dgit.git

diff --git a/tests/tests/gdr-edits b/tests/tests/gdr-edits
index bab3a3dc..bb6c8d15 100755
--- a/tests/tests/gdr-edits
+++ b/tests/tests/gdr-edits
@@ -2,32 +2,35 @@
 set -e
 . tests/lib
 
-t-dependencies git-buildpackage libfile-fnmatch-perl
+t-dependencies git-buildpackage libfile-fnmatch-perl faketime
 
-t-setup-import gbp2gdr
+t-setup-import gdr-convert-gbp
 
 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
+t-gdr-good laundered
+
+t-git-debrebase stitch --prose=wombat
+t-gdr-good stitched
+
+t-dgit push-source
+t-gdr-good pushed
 
-git diff t.before -- ':.' ':!debian/patches'
+: todo 'more tests: other maint updated, we must fetch'
+: todo 'more tests: other maint updated, alert divergence'
+: todo 'more tests: dgit nmu divergence'
 
 t-ok