tests/testlib/topic_setup.sh
author Sushil khanchi <sushilkhanchi97@gmail.com>
Sat, 02 Mar 2019 02:34:29 +0530
changeset 4418 0ec30a7d9e12
parent 2828 fa2deeb5dd03
permissions -rw-r--r--
evolve: add a test in pubdiv where only merging leads to conflict Added a test in public divergence where both the cset are on the different parent and no conflict in relocation but in merging.

#!/bin/sh
. $TESTDIR/testlib/pythonpath.sh

# This file holds logic that is used in many tests.
# It can be called in a test like this:
#  $ . "$TESTDIR/testlib/topic_setup.sh"

# Enable obsolete markers and enable extensions
cat >> $HGRCPATH << EOF
[experimental]
evolution=createmarkers,exchange

[extensions]
rebase=
topic=
EOF