Mercurial > evolve

annotate debian/docs @ 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 9e0f91cb5242
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
531
b18b00036355 pkg/debian: Debian packaging
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
1 html
5404
9e0f91cb5242 evolve: the rest of b3e178f3e31f
Anton Shestakov <av6@dwimlabs.net>
parents: 1103
diff changeset
2 README.rst