changelog: start 9.14

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

diff --git a/tests/tests/gdr-edits b/tests/tests/gdr-edits
index 6c77184a11058541a33b1661ef6c4cf65f036fb9..a8b519c7b8b4c3350bbeee61d8fc637e286f95a1 100755 (executable)
--- a/tests/tests/gdr-edits
+++ b/tests/tests/gdr-edits
@@ -4,6 +4,7 @@ set -e
 
 t-dependencies GDR
 
+t-tstunt-parsechangelog
 t-setup-import gdr-convert-gbp
 
 cd $p
@@ -16,7 +17,7 @@ cat ../anal.1
 
 t-some-changes edits
 
-t-dch-commit -r sid
+t-dch-commit-r
 
 git tag t.before
 
@@ -26,6 +27,9 @@ t-gdr-good laundered
 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
+
 git branch before-noop
 
 t-git-next-date
@@ -37,4 +41,11 @@ 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