evolve: consider all obsolete ancestors when finding new parent for orphan Both the old and the new logic have in common that the orphan changeset is moved to the tipmost successor of one or more ancestors of the orphan changeset. The previous logic considered only the first non-pruned ancestor of the orphan changeset. The new logic considers all obsolete ancestors of the orphan changeset. The logic in _possibledestination() had to be changed to be consistent with the new logic.

     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

    if uname -o | grep -q Msys; then

     7

        export PYTHONPATH="$SRCDIR;$PYTHONPATH"

     8

    else

     9

        export PYTHONPATH=$SRCDIR:$PYTHONPATH

    10

    fi

    11

else

    12

    export PYTHONPATH=$SRCDIR

    13

fi