[PATCH 2 of 3 stable] test-mq-merge: quote ^
Mads Kiilerich
mads at kiilerich.com
Sat May 1 12:26:38 CDT 2010
# HG changeset patch
# User Mads Kiilerich <mads at kiilerich.com>
# Date 1272734689 -7200
# Branch stable
# Node ID f48b8cdfdfe0853d422990db6f1d8f1d1688f986
# Parent c10763814dfed2755f4c3b54a945d6c08d6c1038
test-mq-merge: quote ^
^ is magic on Solaris and must be quoted
diff --git a/tests/test-mq-merge b/tests/test-mq-merge
--- a/tests/test-mq-merge
+++ b/tests/test-mq-merge
@@ -28,7 +28,7 @@
hg qrefresh -m "rm a"
# Save the patch queue so we can merge it later
-hg qsave -c -e 2>&1 | grep -v ^copy
+hg qsave -c -e 2>&1 | grep -v '^copy'
checkundo qsave
# Update b and commit in an "update" changeset
@@ -40,7 +40,7 @@
# Here, qpush used to abort with :
# The system cannot find the file specified => a
hg manifest
-hg qpush -a -m 2>&1 | grep -v ^merging
+hg qpush -a -m 2>&1 | grep -v '^merging'
checkundo 'qpush -m'
hg manifest
More information about the Mercurial-devel
mailing list