Mercurial > evolve

annotate tests/testlib/topic_setup.sh @ 3823:7b33a6ed0539

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 fa2deeb5dd03
children 044ce00dfa88
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
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