merge with stable

This commit is contained in:
Mads Kiilerich 2010-09-24 03:04:14 +02:00
commit 4f78ca6825
2 changed files with 3 additions and 2 deletions

View File

@ -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.

View File

@ -95,7 +95,8 @@ replace broken symlink with another broken symlink
$ 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