X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;ds=sidebyside;f=tests%2Ftests%2Fgdr-edits;h=a8b519c7b8b4c3350bbeee61d8fc637e286f95a1;hb=HEAD;hp=5388f0498bb5045a82ae638def762f65f24cd2c5;hpb=0df7ace43a2137e76134210d58f02c07a0c59323;p=dgit.git

diff --git a/tests/tests/gdr-edits b/tests/tests/gdr-edits
index 5388f049..a8b519c7 100755
--- a/tests/tests/gdr-edits
+++ b/tests/tests/gdr-edits
@@ -2,53 +2,50 @@
 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
-dch -v $v -m testing
-git commit -m changelog debian/changelog
+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
 
-echo >>src.c '// upstream'
-git commit -a -m 'UPSTREAM edit src.c'
-
-for f in debian/zorkmid src.c; do
-	echo '// both!' >>$f
-	git add $f
-done
-git commit -m 'MIXED add boths'
-
-dch -r sid
-git commit -m changelog debian/changelog
+t-dch-commit-r
 
 git tag t.before
 
 t-git-debrebase
+t-gdr-good laundered
 
-git diff t.before -- ':.' ':!debian/patches'
-
-t-gdr-branch-structure laundered
-
-t-git-debrebase stitch --prose=wombat
-
-t-gdr-branch-structure stitched
+t-dgit push-source
+t-gdr-good pushed-interop
 
+t-expect-fail E:'add a new changelog stanza.*and try again' \
 t-dgit push-source
 
-: 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'
+git branch before-noop
+
+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