evolve: use merge.update() for resolving phase divergence Iterating over the manifest when tree manifests and narrowness is in play produces entries for paths outside the narrowspec that represent trees. For example, if the tests/ directory of the hg repo was not in the narrowspec (and the hg repo was using tree manifests, which it doesn't), then there would be a "tests/" entry in the manifest. The merge code deals with some of these cases. For example, it's valid to do a merge if only the local side changes directories outside the narrowspec. That allows rebasing a local commit onto a public commit that had changes to the excluded paths to work. However, _resolvephasedivergent() was iterating of the manifests, which resulted in crashes for some of our users when they tried to resolve phase-divergent commits (actually content-divergent commits that became phase-divergent after the intermediate rebase). We can fix that by relying on merge.update(), since that already handles this case.

     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