Mercurial > hg

changeset 10658:95c7c4b7e67a stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
test-merge-default and check-code.py: No "export x=x" in sh
author Mads Kiilerich <mads@kiilerich.com>
date Mon, 08 Mar 2010 03:07:35 +0100
parents f6ee02933af9
children 19c0ff5606e1
files contrib/check-code.py tests/test-merge-default
diffstat 2 files changed, 2 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/contrib/check-code.py	Thu Mar 11 16:54:34 2010 -0600
+++ b/contrib/check-code.py	Mon Mar 08 03:07:35 2010 +0100
@@ -52,6 +52,7 @@
     (r'/bin/', "don't use explicit paths for tools"),
     (r'\$PWD', "don't use $PWD, use `pwd`"),
     (r'[^\n]\Z', "no trailing newline"),
+    (r'export.*=', "don't export and assign at once"),
 ]
 
 testfilters = [
--- a/tests/test-merge-default	Thu Mar 11 16:54:34 2010 -0600
+++ b/tests/test-merge-default	Mon Mar 08 03:07:35 2010 +0100
@@ -24,7 +24,7 @@
 
 hg up
 echo % should fail because \> 2 heads
-export HGMERGE=internal:other
+HGMERGE=internal:other; export HGMERGE
 hg merge
 
 echo % should succeed