X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=tests%2Ftests%2Fgdr-diverge-nmu-dgit;h=007c35b81d68a40dc071896d98bef400d4a9d3d5;hb=11d37018478b444892c38cf072b3ddd07256793a;hp=4b5907a1caafc13b49a0e676ce0037da651e5bb2;hpb=f7e37ea9f83b46c5efa4152b36c6cc0f4b91fadd;p=dgit.git

diff --git a/tests/tests/gdr-diverge-nmu-dgit b/tests/tests/gdr-diverge-nmu-dgit
index 4b5907a1..007c35b8 100755
--- a/tests/tests/gdr-diverge-nmu-dgit
+++ b/tests/tests/gdr-diverge-nmu-dgit
@@ -28,7 +28,7 @@ t-git-next-date
 v=2.0-2+nmu1
 t-nmu-commit-an-upstream-change
 t-dch-commit -v$v -m finalise
-t-dch-commit -r sid
+t-dch-commit-r
 
 t-dgit -wgf push-source
 
@@ -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' \
 git rebase master
 git rebase --skip