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