path: root/tests
diff options
authorIan Jackson <>2018-08-25 11:55:16 +0100
committerIan Jackson <>2018-08-25 12:15:21 +0100
commitd7f555bf5c00a135d3991e9829450c4de73cafaa (patch)
tree43578ff961a56999c176244973d266cf57f7231d /tests
parent683ef14506d9907dfa102b5e228637415c4922b6 (diff)
test suite: gdr-diverge-nmu-dgit: Tolerate gdr-generated patches
We are about to extend the set of situations where dgit runs git-debrebase make-patches, with the result that the patch commit in this conflict will be made by gdr. This is good, so allow it. Signed-off-by: Ian Jackson <>
Diffstat (limited to 'tests')
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/tests/gdr-diverge-nmu-dgit b/tests/tests/gdr-diverge-nmu-dgit
index 1d136a9..ad39577 100755
--- a/tests/tests/gdr-diverge-nmu-dgit
+++ b/tests/tests/gdr-diverge-nmu-dgit
@@ -42,7 +42,7 @@ t-nmu-causes-ff-fail
git checkout dgit/dgit/sid # detach
-t-expect-fail 'E:CONFLICT.*Commit Debian 3\.0 \(quilt\) metadata' \
+t-expect-fail 'E:CONFLICT.*Commit (patch queue|Debian 3\.0 \(quilt\) metadata)' \
git rebase master
git rebase --skip