X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=tests%2Ftests%2Fgdr-edits;h=a8b519c7b8b4c3350bbeee61d8fc637e286f95a1;hb=e42f3ccb4157d214993f7b68125ee3d6d6a6dde5;hp=52c083b9fd427d1b9107735b654ad0c9451f5caf;hpb=a47f1af332372a372bf5758d1e3d9eeffe14acbd;p=dgit.git diff --git a/tests/tests/gdr-edits b/tests/tests/gdr-edits index 52c083b9..a8b519c7 100755 --- 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 @@ -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