merge with stable

tests/test-gendoc

@@ -1,20 +1,20 b''
 #!/bin/sh
 
 "$TESTDIR/hghave" docutils || exit 80
 
 HGENCODING=UTF-8
 export HGENCODING
 
 for PO in C $TESTDIR/../i18n/*.po; do
     LOCALE=`basename $PO .po`
     echo
     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.
     echo "checking for parse errors"
     python $TESTDIR/../doc/runrst html gendoc-$LOCALE.txt /dev/null
 done

tests/test-mq-symlinks.t

@@ -1,120 +1,121 b''
   $ "$TESTDIR/hghave" symlink || exit 80
 
   $ echo "[extensions]" >> $HGRCPATH
   $ echo "mq=" >> $HGRCPATH
 
   $ hg init
   $ hg qinit
   $ hg qnew base.patch
   $ echo aaa > a
   $ echo bbb > b
   $ echo ccc > c
   $ hg add a b c
   $ hg qrefresh
   $ $TESTDIR/readlink.py a
   a -> a not a symlink
 
 
 test replacing a file with a symlink
 
   $ hg qnew symlink.patch
   $ rm a
   $ ln -s b a
   $ hg qrefresh --git
   $ $TESTDIR/readlink.py a
   a -> b
 
   $ hg qpop
   popping symlink.patch
   now at: base.patch
   $ hg qpush
   applying symlink.patch
   now at: symlink.patch
   $ $TESTDIR/readlink.py a
   a -> b
 
 
 test updating a symlink
 
   $ rm a
   $ ln -s c a
   $ hg qnew --git -f updatelink
   $ $TESTDIR/readlink.py a
   a -> c
   $ hg qpop
   popping updatelink
   now at: symlink.patch
   $ hg qpush --debug
   applying updatelink
   patching file a
   a
   now at: updatelink
   $ $TESTDIR/readlink.py a
   a -> c
   $ hg st
 
 
 test replacing a symlink with a file
 
   $ ln -s c s
   $ hg add s
   $ hg qnew --git -f addlink
   $ rm s
   $ echo sss > s
   $ hg qnew --git -f replacelinkwithfile
   $ hg qpop
   popping replacelinkwithfile
   now at: addlink
   $ hg qpush
   applying replacelinkwithfile
   now at: replacelinkwithfile
   $ cat s
   sss
   $ hg st
 
 
 test symlink removal
 
   $ hg qnew removesl.patch
   $ hg rm a
   $ hg qrefresh --git
   $ hg qpop
   popping removesl.patch
   now at: replacelinkwithfile
   $ hg qpush
   applying removesl.patch
   now at: removesl.patch
   $ hg st -c
   C b
   C c
   C s
 
 replace broken symlink with another broken symlink
 
   $ ln -s linka linka
   $ 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
   now at: link
   $ hg qpush
   applying movelink
   now at: movelink
   $ $TESTDIR/readlink.py linkb
   linkb -> linkb
 
 check patch does not overwrite untracked symlinks
 
   $ hg qpop
   popping movelink
   now at: link
   $ ln -s linkbb linkb
   $ hg qpush
   applying movelink
   patch failed, unable to continue (try -v)
   patch failed, rejects left in working dir
   errors during apply, please fix and refresh movelink
   [2]