X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=blobdiff_plain;f=tests%2Ftests%2Fgdr-edits;h=45a3f20c25e4fe670730a09b0fbeb0a6847adcdb;hp=70735e9e3991e0ec7b8c449c3086deedeb4f9600;hb=1951e44b06b3e179b508bcd139d8758c250e35e2;hpb=672a73e53175a1b382307426912b03bbca8ce19c

diff --git a/tests/tests/gdr-edits b/tests/tests/gdr-edits
index 70735e9e..45a3f20c 100755
--- a/tests/tests/gdr-edits
+++ b/tests/tests/gdr-edits
@@ -2,44 +2,42 @@
 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
 
-git diff t.before -- ':.' ':!debian/patches'
+t-git-debrebase stitch --prose=wombat
+t-gdr-good stitched
 
-t-gdr-branch-structure laundered
+t-dgit push-source
+t-gdr-good pushed
 
-t-git-debrebase stitch --prose=wombat
+git branch before-noop
 
-: todo 'check that all is still well'
+t-git-next-date
+t-git-debrebase
+t-git-debrebase stitch
+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'
+t-refs-same-start
+t-ref-same refs/heads/before-noop
+t-ref-head
 
 t-ok