# HG changeset patch
# User Mads Kiilerich <mads@kiilerich.com>
# Date 2010-09-24 01:04:14
# Node ID 2bc926ad65c2bcbb775d8d32532182d89bb6fb51
# Parent  9d45f78c465b18dbe829a3e3764fb42359dec324
# Parent  3b8ced3e3bbfdce94984cb4e0a01c616450684d4

merge with stable

diff --git a/tests/test-gendoc b/tests/test-gendoc
--- a/tests/test-gendoc
+++ b/tests/test-gendoc
@@ -11,7 +11,7 @@ for PO in C $TESTDIR/../i18n/*.po; do
     echo "% extracting documentation from $LOCALE"
     echo ".. -*- coding: utf-8 -*-" > gendoc-$LOCALE.txt
     echo "" >> gendoc-$LOCALE.txt
-    LC_ALL=$LOCALE python $TESTDIR/../doc/gendoc.py >> gendoc-$LOCALE.txt || exit
+    LC_ALL=$LOCALE python $TESTDIR/../doc/gendoc.py >> gendoc-$LOCALE.txt 2> /dev/null || exit
 
     # We call runrst without adding "--halt warning" to make it report
     # all errors instead of stopping on the first one.
diff --git a/tests/test-mq-symlinks.t b/tests/test-mq-symlinks.t
--- a/tests/test-mq-symlinks.t
+++ b/tests/test-mq-symlinks.t
@@ -95,7 +95,8 @@ replace broken symlink with another brok
   $ hg add linka
   $ hg qnew link
   $ hg mv linka linkb
-  $ ln -sf linkb linkb
+  $ rm linkb
+  $ ln -s linkb linkb
   $ hg qnew movelink
   $ hg qpop
   popping movelink