evolve: add test for the case where public divergence on difference parents This test make sure that public divergence resolution also handle the case when divergentes changeset does not share the same parent at one end because one end simply rebase. The other side has actual an actual diff change. For now this would work only for the case when we need to relocate the mutable one. Other case is still left to work on.

     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