# HG changeset patch
# User Christian Ebert <blacktrash@gmx.net>
# Date 1339419362 -3600
# Node ID 7f458d071b494ff09769f2456522c4b49399a588
# Parent  25db33023e4ed05e15e0740cbe15cff3aa34c224# Parent  cbb200487fb623490cd787e95f41c1392aa8f8d8
Merge with stable

diff -r 25db33023e4e -r 7f458d071b49 tests/run-tests.py
--- a/tests/run-tests.py	Sun Jun 10 16:32:22 2012 +0100
+++ b/tests/run-tests.py	Mon Jun 11 13:56:02 2012 +0100
@@ -601,7 +601,7 @@
         # TODO: do something smarter when all other uses of hghave is gone
         tdir = TESTDIR.replace('\\', '/')
         proc = Popen4('%s -c "%s/hghave %s"' %
-                      (options.shell, tdir, ' '.join(reqs)), TESTDIR, 0)
+                      (options.shell, tdir, ' '.join(reqs)), wd, 0)
         proc.communicate()
         ret = proc.wait()
         if wifexited(ret):
@@ -659,6 +659,9 @@
             prepos = pos
             pos = n
             addsalt(n, False)
+            cmd = l[4:].split()
+            if len(cmd) == 2 and cmd[0] == 'cd':
+                l = '  $ cd %s || exit 1\n' % cmd[1]
             script.append(l[4:])
         elif l.startswith('  > '): # continuations
             after.setdefault(prepos, []).append(l)
diff -r 25db33023e4e -r 7f458d071b49 tests/test-keyword.t
--- a/tests/test-keyword.t	Sun Jun 10 16:32:22 2012 +0100
+++ b/tests/test-keyword.t	Mon Jun 11 13:56:02 2012 +0100
@@ -1,4 +1,4 @@
-  $ "$TESTDIR/hghave" symlink unix-permissions serve || exit 80
+  $ "$TESTDIR/hghave" unix-permissions serve || exit 80
 
   $ cat <<EOF >> $HGRCPATH
   > [extensions]
@@ -658,6 +658,8 @@
   $ hg update --clean
   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
+#if symlink
+
 cp symlink file; hg cp -A symlink file (part2)
 - copied symlink points to kw ignored file: do not overwrite
 
@@ -679,6 +681,8 @@
   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ rm i symignored
 
+#endif
+
 Custom keywordmaps as argument to kwdemo
 
   $ hg --quiet kwdemo "Xinfo = {author}: {desc}"
@@ -1123,3 +1127,5 @@
   $Xinfo$
   ignore $Id$
   a
+
+  $ cd ..