# HG changeset patch
# User Mads Kiilerich <mads@kiilerich.com>
# Date 2010-03-31 09:07:46
# Node ID 6e4cf8319f54de91c44063215833321d1577a447
# Parent  fcfe2e50faabf705fec1fff3df4e0a12461a5727

check-code.py: Check for bare ^

Solaris sh interprets ^ as some kind of piping symbol.

diff --git a/contrib/check-code.py b/contrib/check-code.py
--- a/contrib/check-code.py
+++ b/contrib/check-code.py
@@ -53,6 +53,7 @@ testpats = [
     (r'\$PWD', "don't use $PWD, use `pwd`"),
     (r'[^\n]\Z', "no trailing newline"),
     (r'export.*=', "don't export and assign at once"),
+    ('^([^"\']|("[^"]*")|(\'[^\']*\'))*\\^', "^ must be quoted"),
 ]
 
 testfilters = [
diff --git a/tests/test-convert-baz b/tests/test-convert-baz
--- a/tests/test-convert-baz
+++ b/tests/test-convert-baz
@@ -30,7 +30,7 @@ cd src
 dd count=1 if=/dev/zero of=b > /dev/null 2> /dev/null
 baz add b
 # HACK: hide GNU tar-1.22 "tar: The --preserve option is deprecated, use --preserve-permissions --preserve-order instead"
-baz commit -s "added a file, src and src/b (binary)" 2>&1 | grep -v ^tar
+baz commit -s "added a file, src and src/b (binary)" 2>&1 | grep -v '^tar'
 
 echo % create link file and modify a
 ln -s ../a a-link
diff --git a/tests/test-convert-cvs-synthetic b/tests/test-convert-cvs-synthetic
--- a/tests/test-convert-cvs-synthetic
+++ b/tests/test-convert-cvs-synthetic
@@ -110,7 +110,7 @@ hg -R proj.hg glog --template "{rev} {de
 
 echo "% convert to hg (#2: with merge detection)"
 filterpath hg convert \
-  --config convert.cvsps.mergefrom="\"^MERGE from (\S+):\"" \
+  --config convert.cvsps.mergefrom='"^MERGE from (\S+):"' \
   --datesort \
   proj proj.hg2