Mercurial > evolve
view tests/testlib/pythonpath.sh @ 3823:7b33a6ed0539
tests: add test for --stop flag when resolving multiparents content-div
This patch adds a test for --stop flag when we are in an interrupted
content-divergent resolution which have multiple parents. Conflicts happen we
merge the divergent changesets after relocation. The test shows that we
need to strip the relocated changeset.
author | Pulkit Goyal <7895pulkit@gmail.com> |
---|---|
date | Sun, 10 Jun 2018 22:38:08 +0530 |
parents | 994d81caec68 |
children | 9980df8eda98 |
line wrap: on
line source
# utility to setup pythonpath to point into the tested repository export SRCDIR=`dirname $TESTDIR` if [ -n "$PYTHONPATH" ]; then export HGTEST_ORIG_PYTHONPATH=$PYTHONPATH export PYTHONPATH=$SRCDIR:$PYTHONPATH else export PYTHONPATH=$SRCDIR fi