merge in commit that shouldn't be on default stable
authorMads Kiilerich <mads@kiilerich.com>
Mon, 17 Oct 2011 01:40:50 +0200
branchstable
changeset 15283 748715a380bc
parent 15280 52bc0c4daaf9 (current diff)
parent 15282 d4addef0ec74 (diff)
child 15284 ebeac9c41456
merge in commit that shouldn't be on default
--- a/contrib/check-code.py	Sun Oct 16 17:22:07 2011 -0500
+++ b/contrib/check-code.py	Mon Oct 17 01:40:50 2011 +0200
@@ -69,6 +69,7 @@
     (r'ls\s+[^|-]+\s+-', "options to 'ls' must come before filenames"),
     (r'[^>]>\s*\$HGRCPATH', "don't overwrite $HGRCPATH, append to it"),
     (r'stop\(\)', "don't use 'stop' as a shell function name"),
+    (r'(\[|\btest\b).*-e ', "don't use 'test -e', use 'test -f'"),
   ],
   # warnings
   []
--- a/tests/test-subrepo-svn.t	Sun Oct 16 17:22:07 2011 -0500
+++ b/tests/test-subrepo-svn.t	Mon Oct 17 01:40:50 2011 +0200
@@ -581,5 +581,5 @@
   A    $TESTTMP/rebaserepo/recreated/somethingold
   Checked out revision 10.
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
-  $ test -e recreated/somethingold
+  $ test -f recreated/somethingold