X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=tests%2Ftests%2Fgdr-edits;h=d82c2383f1ab639a022bbb28deb7cfc7eb9c989f;hb=81b54cfc353832f717ad514b7c6a14e55a380b7d;hp=1d74da3b54d1961983bdd06322cead0ebd6ae420;hpb=237fe933713ea3d86ed8fbdb86819797b770405b;p=dgit.git

diff --git a/tests/tests/gdr-edits b/tests/tests/gdr-edits
index 1d74da3b..d82c2383 100755
--- a/tests/tests/gdr-edits
+++ b/tests/tests/gdr-edits
@@ -4,24 +4,34 @@ set -e
 
 t-dependencies git-buildpackage libfile-fnmatch-perl
 
-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'
+t-some-changes edits
+
+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
 
-echo >>src.c '// upstream'
-git commit -a -m 'UPSTREAM edit src.c'
+t-dgit push-source
+t-gdr-good pushed
 
-for f in debian/zorkmid src.c; do
-	echo '// both!' >>$f
-	git add $f
-done
-git commit -m 'MIXED add boths'
+: todo 'more tests: convert dgit import new 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