tests/testlib/topic_setup.sh
author Pulkit Goyal <7895pulkit@gmail.com>
Thu, 07 Jun 2018 18:18:30 +0530
changeset 3881 9cf45b94f977
parent 2828 fa2deeb5dd03
permissions -rw-r--r--
evolve: continue conflicted relocation content-divergence This patch adds logic to continue an conflicted content-divergence resolution which was interrupted while relocating one of the divergent commits. The tests shows the there is some mishandling of copies internally which will be fixed in next patch.
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
1839
1bc5e62fc0c7 Initial dumb version of topics.
Augie Fackler <augie@google.com>
parents:
diff changeset
     1
#!/bin/sh
2828
fa2deeb5dd03 test: setup python path for topic tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2045
diff changeset
     2
. $TESTDIR/testlib/pythonpath.sh
1839
1bc5e62fc0c7 Initial dumb version of topics.
Augie Fackler <augie@google.com>
parents:
diff changeset
     3
1bc5e62fc0c7 Initial dumb version of topics.
Augie Fackler <augie@google.com>
parents:
diff changeset
     4
# This file holds logic that is used in many tests.
1bc5e62fc0c7 Initial dumb version of topics.
Augie Fackler <augie@google.com>
parents:
diff changeset
     5
# It can be called in a test like this:
2045
db617700d318 tests: move "test setup" script into a 'testlib' directory
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 1901
diff changeset
     6
#  $ . "$TESTDIR/testlib/topic_setup.sh"
1839
1bc5e62fc0c7 Initial dumb version of topics.
Augie Fackler <augie@google.com>
parents:
diff changeset
     7
1840
2321fd2ed56e testlib: enable rebase and obsolete for easier testing
Augie Fackler <augie@google.com>
parents: 1839
diff changeset
     8
# Enable obsolete markers and enable extensions
2321fd2ed56e testlib: enable rebase and obsolete for easier testing
Augie Fackler <augie@google.com>
parents: 1839
diff changeset
     9
cat >> $HGRCPATH << EOF
2321fd2ed56e testlib: enable rebase and obsolete for easier testing
Augie Fackler <augie@google.com>
parents: 1839
diff changeset
    10
[experimental]
2321fd2ed56e testlib: enable rebase and obsolete for easier testing
Augie Fackler <augie@google.com>
parents: 1839
diff changeset
    11
evolution=createmarkers,exchange
2321fd2ed56e testlib: enable rebase and obsolete for easier testing
Augie Fackler <augie@google.com>
parents: 1839
diff changeset
    12
2321fd2ed56e testlib: enable rebase and obsolete for easier testing
Augie Fackler <augie@google.com>
parents: 1839
diff changeset
    13
[extensions]
2321fd2ed56e testlib: enable rebase and obsolete for easier testing
Augie Fackler <augie@google.com>
parents: 1839
diff changeset
    14
rebase=
2828
fa2deeb5dd03 test: setup python path for topic tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2045
diff changeset
    15
topic=
1840
2321fd2ed56e testlib: enable rebase and obsolete for easier testing
Augie Fackler <augie@google.com>
parents: 1839
diff changeset
    16
EOF