git-debrebase: Rename new-upstream-v0 command to new-upstream

[dgit.git] / tests / tests / gdr-edits

diff --git a/tests/tests/gdr-edits b/tests/tests/gdr-edits
index cff33b1d1e791506ac209d2078fbab081d06f570..6c77184a11058541a33b1661ef6c4cf65f036fb9 100755 (executable)
--- 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
 
@@ -21,23 +21,20 @@ t-dch-commit -r sid
 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