From: Ian Jackson Date: Sat, 25 Aug 2018 10:55:16 +0000 (+0100) Subject: test suite: gdr-diverge-nmu-dgit: Tolerate gdr-generated patches X-Git-Tag: archive/debian/6.10~56 X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=commitdiff_plain;h=d7f555bf5c00a135d3991e9829450c4de73cafaa 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 --- diff --git a/tests/tests/gdr-diverge-nmu-dgit b/tests/tests/gdr-diverge-nmu-dgit index 1d136a94..ad39577a 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