# HG changeset patch
# User Matt Mackall <mpm@selenic.com>
# Date 1318821343 18000
# Node ID ebeac9c414562d0b3aaa8f353b4dcd20aac7cea8
# Parent  aeeb2afcdc25aa0ae40ae00394f07ecd2598624c# Parent  748715a380bc0600b19350df8a1d033bb9d77fee
merge with crew

diff -r aeeb2afcdc25 -r ebeac9c41456 contrib/check-code.py
--- a/contrib/check-code.py	Sun Oct 16 20:26:20 2011 -0500
+++ b/contrib/check-code.py	Sun Oct 16 22:15:43 2011 -0500
@@ -69,6 +69,7 @@
     (r'ls\s+[^|\n-]+\s+-', "options to 'ls' must come before filenames"),
     (r'[^>\n]>\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
   []
diff -r aeeb2afcdc25 -r ebeac9c41456 tests/test-subrepo-svn.t
--- a/tests/test-subrepo-svn.t	Sun Oct 16 20:26:20 2011 -0500
+++ b/tests/test-subrepo-svn.t	Sun Oct 16 22:15:43 2011 -0500
@@ -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