next-prev: always respect the --merge flag An earlier bug fix series which started respecting commands.update.check introduced a bug in which --merge was not respected sometimes. This patch fixes that behavior by passing updatecheck as 'none' to hg.updatetotally() if --merge is passed which is similar to what `hg update` does.

     1

# utility to setup pythonpath to point into the tested repository

     2

     3

export SRCDIR=`dirname $TESTDIR`

     4

if [ -n "$PYTHONPATH" ]; then

     5

    export HGTEST_ORIG_PYTHONPATH=$PYTHONPATH

     6

    export PYTHONPATH=$SRCDIR:$PYTHONPATH

     7

else

     8

    export PYTHONPATH=$SRCDIR

     9

fi