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 1d74da3b54d1961983bdd06322cead0ebd6ae420..124de29c24cdb5e52d326f76d0b9b230c5d0646d 100755 (executable)
--- a/tests/tests/gdr-edits
+++ b/tests/tests/gdr-edits
@@ -2,26 +2,40 @@
 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
 
+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'
+t-some-changes edits
+
+t-dch-commit-r
+
+git tag t.before
+
+t-git-debrebase
+t-gdr-good laundered
+
+t-dgit push-source
+t-gdr-good pushed-interop
+
+git branch before-noop
 
-echo >>src.c '// upstream'
-git commit -a -m 'UPSTREAM edit src.c'
+t-git-next-date
+t-git-debrebase
+t-git-debrebase stitch
+t-gdr-good pushed-interop
 
-for f in debian/zorkmid src.c; do
-       echo '// both!' >>$f
-       git add $f
-done
-git commit -m 'MIXED add boths'
+t-refs-same-start
+t-ref-same refs/heads/before-noop
+t-ref-head
 
 t-ok