[PATCH stable] test-merge-default and check-code.py: No "export x=x" in sh

[Mads Kiilerich]

# HG changeset patch
# User Mads Kiilerich <mads at kiilerich.com>
# Date 1268014055 -3600
# Branch stable
# Node ID c1c21ceca8a63ee38e9882aae52705aa78acae71
# Parent  47f9868d8dcfe623a2f30bd3d114ba39991bfd07
test-merge-default and check-code.py: No "export x=x" in sh

diff --git a/contrib/check-code.py b/contrib/check-code.py
--- a/contrib/check-code.py
+++ b/contrib/check-code.py
@@ -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 --git a/tests/test-merge-default b/tests/test-merge-default
--- a/tests/test-merge-default
+++ b/tests/test-merge-default
@@ -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