# HG changeset patch
# User Mads Kiilerich <mads@kiilerich.com>
# Date 1268014055 -3600
# Node ID 95c7c4b7e67aceef0a42adb88677c4b5b0019281
# Parent  f6ee02933af911b251c95815d6efc03c1ef599d4
test-merge-default and check-code.py: No "export x=x" in sh

diff -r f6ee02933af9 -r 95c7c4b7e67a contrib/check-code.py
--- 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 = [
diff -r f6ee02933af9 -r 95c7c4b7e67a tests/test-merge-default
--- 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