diff 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.

--- a/CHANGELOG	Thu Oct 15 19:46:38 2020 +0200
+++ b/CHANGELOG	Wed Oct 14 15:48:37 2020 +0200
@@ -16,6 +16,8 @@
 topic (0.20.0)
 
   * stack: support foo#stack relation revset (hg-5.4+ only)
+  * merge: add a experimental.topic.linear-merge option to allow oedipus merges
+           in some cases.
 
 10.0.3 - in progress
 --------------------