chiark
/
gitweb
/
~ianmdlvl
/
dgit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
test suite: gdr-diverge-nmu-dgit: Insist on gdr-generated patches
[dgit.git]
/
tests
/
tests
/
gdr-diverge-nmu-dgit
diff --git
a/tests/tests/gdr-diverge-nmu-dgit
b/tests/tests/gdr-diverge-nmu-dgit
index 1d136a94b0bfb85751868d07417a72d7529b4c0b..007c35b81d68a40dc071896d98bef400d4a9d3d5 100755
(executable)
--- 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
' \
git rebase master
git rebase --skip