Mercurial > evolve
comparison CHANGELOG @ 5601:3946ee4ee3ae
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 | d77d61c9e5e9 |
| children | 87ee065a688b |
comparison
equal
deleted
inserted
replaced
| 5600:d77d61c9e5e9 | 5601:3946ee4ee3ae |
|---|---|
| 14 but it will show up as `%` with hg >= 5.4) | 14 but it will show up as `%` with hg >= 5.4) |
| 15 | 15 |
| 16 topic (0.20.0) | 16 topic (0.20.0) |
| 17 | 17 |
| 18 * stack: support foo#stack relation revset (hg-5.4+ only) | 18 * stack: support foo#stack relation revset (hg-5.4+ only) |
| 19 * merge: add a experimental.topic.linear-merge option to allow oedipus merges | |
| 20 in some cases. | |
| 19 | 21 |
| 20 10.0.3 - in progress | 22 10.0.3 - in progress |
| 21 -------------------- | 23 -------------------- |
| 22 | 24 |
| 23 * evolve: specific the source of config override for `server.bundle1=no` | 25 * evolve: specific the source of config override for `server.bundle1=no` |