From 17ff17bd19aff9d185f4771d35ce9663c364aeab Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Sat, 25 Aug 2018 11:55:42 +0100 Subject: 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 --- tests/tests/gdr-diverge-nmu-dgit | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'tests') diff --git a/tests/tests/gdr-diverge-nmu-dgit b/tests/tests/gdr-diverge-nmu-dgit index ad39577..007c35b 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 -- cgit v1.2.3