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
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-interop
+t-expect-fail E:'add a new changelog stanza.*and try again' \
t-dgit push-source
-t-gdr-good pushed
-: 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