Mercurial Mercurial > mercurial / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests: fix reported patch tool name in test-mq
authorMads Kiilerich <mads@kiilerich.com>
Thu, 18 Sep 2008 13:45:36 +0200
changeset 7042 0ada66dcc259
parent 7041 b856071435f7
child 7043 b714aac1f7b3
tests: fix reported patch tool name in test-mq Strip any path of the patch executable, which it might return on failure.
tests/test-mq file | annotate | diff | comparison | revisions
tests/test-mq.out file | annotate | diff | comparison | revisions 
--- a/tests/test-mq	Thu Sep 18 13:48:41 2008 +0200
+++ b/tests/test-mq	Thu Sep 18 13:45:36 2008 +0200
@@ -512,7 +512,7 @@
 hg qpush
 
 echo % apply force, should not discard changes with empty patch
-hg qpush -f
+hg qpush -f 2>&1 | sed 's,^.*/patch,patch,g'
 hg diff --config diff.nodates=True
 hg qdiff --config diff.nodates=True
 hg log -l1 -p
--- a/tests/test-mq.out	Thu Sep 18 13:48:41 2008 +0200
+++ b/tests/test-mq.out	Thu Sep 18 13:45:36 2008 +0200
@@ -492,7 +492,7 @@
 abort: local changes found, refresh first
 % apply force, should not discard changes with empty patch
 applying empty
-/usr/bin/patch: **** Only garbage was found in the patch input.
+patch: **** Only garbage was found in the patch input.
 patch failed, unable to continue (try -v)
 patch empty is empty
 Now at: empty
mercurial