[PATCH] test-mq: don't depend on patch(1) output

Maxim Dounin mdounin at mdounin.ru
Wed May 7 06:19:39 CDT 2008


Hello!

This fixes tests under FreeBSD at least.

# HG changeset patch
# User Maxim Dounin <mdounin at mdounin.ru>
# Date 1210158631 -14400
# Node ID a4207b8a77195a34f80696a1b02f160cd191b208
# Parent  55fc98ae0bdaae56b2f4a7e53827af28042a6c57
test-mq: don't depend on patch(1) output

diff --git a/tests/test-mq b/tests/test-mq
--- a/tests/test-mq
+++ b/tests/test-mq
@@ -520,7 +520,7 @@ hg qpush
 hg qpush
 
 echo % apply force, should not discard changes with empty patch
-hg qpush -f
+hg qpush -f 2>&1 | grep 'Now at'
 hg diff --config diff.nodates=True
 hg qdiff --config diff.nodates=True
 hg log -l1 -p
diff --git a/tests/test-mq.out b/tests/test-mq.out
--- a/tests/test-mq.out
+++ b/tests/test-mq.out
@@ -497,10 +497,6 @@ Patch queue now empty
 % qpush should fail, local changes
 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 failed, unable to continue (try -v)
-patch empty is empty
 Now at: empty
 diff -r bf5fc3f07a0a hello.txt
 --- a/hello.txt


More information about the Mercurial-devel mailing list