chiark / gitweb /
test suite: gdr-diverge-nmu-dgit: Insist on gdr-generated patches
authorIan Jackson <ijackson@chiark.greenend.org.uk>
Sat, 25 Aug 2018 10:55:42 +0000 (11:55 +0100)
committerIan Jackson <ijackson@chiark.greenend.org.uk>
Sat, 25 Aug 2018 11:55:17 +0000 (12:55 +0100)
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 <ijackson@chiark.greenend.org.uk>
tests/tests/gdr-diverge-nmu-dgit

index ad39577..007c35b 100755 (executable)
@@ -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