From: Ian Jackson Date: Sat, 25 Aug 2018 10:55:42 +0000 (+0100) Subject: test suite: gdr-diverge-nmu-dgit: Insist on gdr-generated patches X-Git-Tag: archive/debian/6.10~53 X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=17ff17bd19aff9d185f4771d35ce9663c364aeab;p=dgit.git test suite: gdr-diverge-nmu-dgit: Insist on gdr-generated patches Now dgit runs git-debrebase make-patches, with the result that the patch commit in this conflict will be made by gdr. This is what we want, so now that we have it, insist on it. Signed-off-by: Ian Jackson --- diff --git a/tests/tests/gdr-diverge-nmu-dgit b/tests/tests/gdr-diverge-nmu-dgit index ad39577a..007c35b8 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 (patch queue|Debian 3\.0 \(quilt\) metadata)' \ +t-expect-fail 'E:CONFLICT.*Commit patch queue' \ git rebase master git rebase --skip