[PATCH 2 of 6] Fix test-mq: Normalize reported patch tool name by stripping anything that looks like a path

Mads Kiilerich mads at kiilerich.com
Wed Sep 17 14:06:19 CDT 2008


# HG changeset patch
# User Mads Kiilerich <mads at kiilerich.com>
# Date 1221677995 -7200
# Node ID 333618dac4efe5db2a5ab8e47f4321dec83ef547
# Parent  8929680d295e368bc7066a2a02a0e39181def785
Fix test-mq: Normalize reported patch tool name by stripping anything that looks like a path.
The external patch command sometimes reports full path in error messages and sometimes not.

diff -r 8929680d295e -r 333618dac4ef tests/test-mq
--- a/tests/test-mq	Wed Sep 17 20:59:03 2008 +0200
+++ b/tests/test-mq	Wed Sep 17 20:59:55 2008 +0200
@@ -520,7 +520,7 @@
 hg qpush
 
 echo % apply force, should not discard changes with empty patch
-hg qpush -f
+hg qpush -f 2>&1 | sed 's,^\(patch:\),/usr/bin/\1,g'
 hg diff --config diff.nodates=True
 hg qdiff --config diff.nodates=True
 hg log -l1 -p


More information about the Mercurial-devel mailing list