# HG changeset patch
# User Benoit Boissinot <benoit.boissinot@ens-lyon.org>
# Date 1229171300 -3600
# Node ID dd66d161a14bee7671ccf9ec8fe5cd48bdad5677
# Parent  f43a8b0ca3e8dcbfd86f5c3740a348fa72c93698# Parent  0d488f7f321d217cdf303f500661b542e522a9e2
merge with -stable

diff -r f43a8b0ca3e8 -r dd66d161a14b tests/test-acl
--- a/tests/test-acl	Fri Dec 12 12:34:57 2008 -0800
+++ b/tests/test-acl	Sat Dec 13 13:28:20 2008 +0100
@@ -14,7 +14,11 @@
 	cat acl.config
 	echo '"""'
     fi
-    LOGNAME=$user hg --cwd a --debug push ../b
+    # On AIX /etc/profile sets LOGNAME read-only. So
+    #  LOGNAME=$user hg --cws a --debug push ../b
+    # fails with "This variable is read only."
+    # Use env to work around this.
+    env LOGNAME=$user hg --cwd a --debug push ../b
     hg --cwd b rollback
     hg --cwd b --quiet tip
     echo