X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;ds=sidebyside;f=tests%2Ftests%2Fgdr-edits;h=52c083b9fd427d1b9107735b654ad0c9451f5caf;hb=a47f1af332372a372bf5758d1e3d9eeffe14acbd;hp=cff33b1d1e791506ac209d2078fbab081d06f570;hpb=4cb451aa46ad449116f9ff0d1a4450e6dcc01d4f;p=dgit.git

diff --git a/tests/tests/gdr-edits b/tests/tests/gdr-edits
index cff33b1d..52c083b9 100755
--- a/tests/tests/gdr-edits
+++ b/tests/tests/gdr-edits
@@ -2,9 +2,9 @@
 set -e
 . tests/lib
 
-t-dependencies git-buildpackage libfile-fnmatch-perl
+t-dependencies GDR
 
-t-setup-import gbp2gdr
+t-setup-import gdr-convert-gbp
 
 cd $p
 
@@ -16,28 +16,25 @@ cat ../anal.1
 
 t-some-changes edits
 
-t-dch-commit -r sid
+t-dch-commit-r
 
 git tag t.before
 
 t-git-debrebase
-
-git diff t.before -- ':.' ':!debian/patches'
-
-t-gdr-branch-structure laundered
-
-t-git-debrebase stitch --prose=wombat
-
-t-gdr-branch-structure stitched
+t-gdr-good laundered
 
 t-dgit push-source
+t-gdr-good pushed-interop
+
+git branch before-noop
 
-t-gdr-branch-structure pushed
+t-git-next-date
+t-git-debrebase
+t-git-debrebase stitch
+t-gdr-good pushed-interop
 
-: 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