Mercurial > evolve

annotate tests/test-check-compat-strings.t @ 5601:3946ee4ee3ae

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
topic: add a `exp….topic.linear-merge` option to allow some oedipus If this option is set to `from-branch`, a user can call `hg merge some-topic` from a bare branch even if `some-topic` is a direct descendant of the current working copy parents. This was previously denied if the changesets was on the same branch, since the result would be an "oedipus merge". Some user have been requesting this, and this type of merge is one of Gitlab standard way of merging a "Merge Request". That new option will unlock issue `heptapod#200` and make this mode available for those who wants it.
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Wed, 14 Oct 2020 15:48:37 +0200
parents 73cd416a1653
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
5193
a4d081923c81 compat: update hg-X.Y compat comments and test them
Anton Shestakov <av6@dwimlabs.net>
parents:
diff changeset
1 Enable obsolescence to avoid the warning issue when obsmarkers are found
a4d081923c81 compat: update hg-X.Y compat comments and test them
Anton Shestakov <av6@dwimlabs.net>
parents:
diff changeset
2
a4d081923c81 compat: update hg-X.Y compat comments and test them
Anton Shestakov <av6@dwimlabs.net>
parents:
diff changeset
3 $ cat << EOF >> $HGRCPATH
a4d081923c81 compat: update hg-X.Y compat comments and test them
Anton Shestakov <av6@dwimlabs.net>
parents:
diff changeset
4 > [experimental]
a4d081923c81 compat: update hg-X.Y compat comments and test them
Anton Shestakov <av6@dwimlabs.net>
parents:
diff changeset
5 > evolution = all
a4d081923c81 compat: update hg-X.Y compat comments and test them
Anton Shestakov <av6@dwimlabs.net>
parents:
diff changeset
6 > EOF
a4d081923c81 compat: update hg-X.Y compat comments and test them
Anton Shestakov <av6@dwimlabs.net>
parents:
diff changeset
7
5350
73cd416a1653 tests: replace check-compat-strings.sh with a Python script
Anton Shestakov <av6@dwimlabs.net>
parents: 5331
diff changeset
8 $ "$PYTHON" "$TESTDIR/testlib/check-compat-strings.py" \
73cd416a1653 tests: replace check-compat-strings.sh with a Python script
Anton Shestakov <av6@dwimlabs.net>
parents: 5331
diff changeset
9 > "$TESTDIR/../hgext3rd/" "$RUNTESTDIR/.."