git-debrebase: merge: New record-resolved-merge subcommand, WIP

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

diff --git a/tests/tests/gdr-edits b/tests/tests/gdr-edits
index 45a3f20c25e4fe670730a09b0fbeb0a6847adcdb..124de29c24cdb5e52d326f76d0b9b230c5d0646d 100755 (executable)
--- a/tests/tests/gdr-edits
+++ b/tests/tests/gdr-edits
@@ -2,8 +2,9 @@
 set -e
 . tests/lib
 
-t-dependencies git-buildpackage libfile-fnmatch-perl faketime
+t-dependencies GDR
 
+t-tstunt-parsechangelog
 t-setup-import gdr-convert-gbp
 
 cd $p
@@ -16,25 +17,22 @@ 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
 
 t-git-next-date
 t-git-debrebase
 t-git-debrebase stitch
-t-gdr-good pushed
+t-gdr-good pushed-interop
 
 t-refs-same-start
 t-ref-same refs/heads/before-noop