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

diff --git a/tests/tests/gdr-edits b/tests/tests/gdr-edits
index d4e2a85a..0bdf15fd 100755
--- a/tests/tests/gdr-edits
+++ b/tests/tests/gdr-edits
@@ -2,9 +2,10 @@
 set -e
 . tests/lib
 
-t-dependencies git-buildpackage libfile-fnmatch-perl
+t-dependencies GDR
 
-t-setup-import gbp2gdr
+t-tstunt-parsechangelog
+t-setup-import gdr-convert-gbp
 
 cd $p
 
@@ -16,23 +17,32 @@ cat ../anal.1
 
 t-some-changes edits
 
-t-dch-commit -r sid
+t-dch-commit-r
 
 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
+t-gdr-good pushed-interop
+
+git branch before-noop
 
-: 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-git-next-date
+t-git-debrebase
+t-git-debrebase stitch
+t-gdr-good pushed-interop
+
+t-refs-same-start
+t-ref-same refs/heads/before-noop
+t-ref-head
+
+git checkout -b some-new-branch
+t-some-changes 2nd-maintainer
+t-dgit quilt-fixup
+t-gdr-made-patches
+#  NB quilt-fixup doesn't always manage to call gdr;
+#  push does, since it will make the pseudomerge first
 
 t-ok