# HG changeset patch
# User Patrick Mezard <pmezard@gmail.com>
# Date 1186694969 -7200
# Node ID 9555f3b9489d0a308e77b584de6048226082e62d
# Parent  4f648e95cacabe246a060297b85e2c288713da89# Parent  bf60e4bd66729a687cb73d489ea9b886506cffa2
Merge with crew-stable

diff --git a/tests/hghave b/tests/hghave
--- a/tests/hghave
+++ b/tests/hghave
@@ -8,6 +8,8 @@ import os
 import sys
 import tempfile
 
+tempprefix = 'hg-hghave-'
+
 def has_symlink():
     return hasattr(os, "symlink")
 
@@ -15,7 +17,7 @@ def has_fifo():
     return hasattr(os, "mkfifo")
 
 def has_executablebit():
-    fd, path = tempfile.mkstemp()
+    fd, path = tempfile.mkstemp(prefix=tempprefix)
     os.close(fd)
     try:
         s = os.lstat(path).st_mode
@@ -26,7 +28,7 @@ def has_executablebit():
 
 def has_eol_in_paths():
     try:
-        fd, path = tempfile.mkstemp(suffix='\n\r')
+        fd, path = tempfile.mkstemp(prefix=tempprefix, suffix='\n\r')
         os.close(fd)
         os.remove(path)
         return True
diff --git a/tests/test-no-symlinks b/tests/test-no-symlinks
--- a/tests/test-no-symlinks
+++ b/tests/test-no-symlinks
@@ -12,13 +12,13 @@
 # ln -s a a.lnk
 # ln -s d/b d/b.lnk
 # hg ci -Am t
-# hg bundle --base null ../test-no-symlinks.bundle
+# hg bundle --base null ../test-no-symlinks.hg
 
 # Extract a symlink on a platform not supporting them
 echo % unbundle
 hg init t
 cd t
-hg pull "$TESTDIR/test-no-symlinks.bundle"
+hg pull "$TESTDIR/test-no-symlinks.hg"
 hg update
 
 cat a.lnk && echo
@@ -34,12 +34,12 @@ cat b2.lnk && echo
 
 # Bundle and extract again
 echo % bundle
-hg bundle --base null ../symlinks.bundle
+hg bundle --base null ../symlinks.hg
 cd ..
 
 hg init t2
 cd t2
-hg pull ../symlinks.bundle
+hg pull ../symlinks.hg
 hg update
 
 cat a.lnk && echo
diff --git a/tests/test-no-symlinks.bundle b/tests/test-no-symlinks.hg
rename from tests/test-no-symlinks.bundle
rename to tests/test-no-symlinks.hg
diff --git a/tests/test-no-symlinks.out b/tests/test-no-symlinks.out
--- a/tests/test-no-symlinks.out
+++ b/tests/test-no-symlinks.out
@@ -1,5 +1,5 @@
 % unbundle
-pulling from C:\dev\mercurial\hg\hg-local-stable\tests/test-no-symlinks.bundle
+pulling from C:\dev\mercurial\hg\hg-local-stable\tests/test-no-symlinks.hg
 requesting all changes
 adding changesets
 adding manifests
@@ -13,7 +13,7 @@ d/b
 a
 d/b
 % bundle
-pulling from ../symlinks.bundle
+pulling from ../symlinks.hg
 requesting all changes
 adding changesets
 adding manifests