Mercurial > hg
changeset 16483:3c4910364797 stable
tests: ^ must be quoted when used on solaris sh
The check was broken when it was introduced in 6e4cf8319f54.
| author | Mads Kiilerich <mads@kiilerich.com> |
|---|---|
| date | Mon, 23 Apr 2012 01:39:26 +0200 |
| parents | a5d359b3927a |
| children | bf877ebed866 |
| files | contrib/check-code.py tests/test-commit-amend.t |
| diffstat | 2 files changed, 3 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/contrib/check-code.py Mon Apr 23 01:39:26 2012 +0200 +++ b/contrib/check-code.py Mon Apr 23 01:39:26 2012 +0200 @@ -65,7 +65,7 @@ (r'\$PWD', "don't use $PWD, use `pwd`"), (r'[^\n]\Z', "no trailing newline"), (r'export.*=', "don't export and assign at once"), - (r'^([^"\'\n]|("[^"\n]*")|(\'[^\'\n]*\'))*\\^', "^ must be quoted"), + (r'^([^"\'\n]|("[^"\n]*")|(\'[^\'\n]*\'))*\^', "^ must be quoted"), (r'^source\b', "don't use 'source', use '.'"), (r'touch -d', "don't use 'touch -d', use 'touch -t' instead"), (r'ls +[^|\n-]+ +-', "options to 'ls' must come before filenames"),
--- a/tests/test-commit-amend.t Mon Apr 23 01:39:26 2012 +0200 +++ b/tests/test-commit-amend.t Mon Apr 23 01:39:26 2012 +0200 @@ -273,7 +273,7 @@ $ hg mv c d $ hg ci --amend -m 'b -> d' saved backup bundle to $TESTTMP/.hg/strip-backup/9c207120aa98-amend-backup.hg - $ hg st --rev .^ --copies d + $ hg st --rev '.^' --copies d A d b $ hg cp d e @@ -281,7 +281,7 @@ $ hg cp e f $ hg ci --amend -m 'f = d' saved backup bundle to $TESTTMP/.hg/strip-backup/fda2b3b27b22-amend-backup.hg - $ hg st --rev .^ --copies f + $ hg st --rev '.^' --copies f A f d