| Submitter | phabricator |
|---|---|
| Date | Feb. 18, 2021, 6:43 p.m. |
| Message ID | <differential-rev-PHID-DREV-jmsyu2xp6qgevfi52ej4-req@mercurial-scm.org> |
| Download | mbox | patch |
| Permalink | /patch/48334/ |
| State | Superseded |
| Headers | show |
Comments
Patch
diff --git a/mercurial/configitems.py b/mercurial/configitems.py --- a/mercurial/configitems.py +++ b/mercurial/configitems.py @@ -952,6 +952,11 @@ ) coreconfigitem( b'experimental', + b'evolution.divergence-resolution-minimal', + default=False, +) +coreconfigitem( + b'experimental', b'log.topo', default=False, )
khanchi97 created this revision. Herald added a reviewer: hg-reviewers. Herald added a subscriber: mercurial-patches. REVISION SUMMARY Config: experimental.evolution.divergence-resolution-minimal=False (default) This experimental config gives user the flexibility to choose (in a special case of divergence) how they would like to resolve. Special case: when divergence is created by one side amended some changes and other relocated to an obsolete cset which has a successor as well. By default, evolution will set the successor of obsolete parent as resolution parent and will relocate both the divergent cset on it to perform 3-way merge. But if this config is set to True, it will set the obsolete parent as resolution parent, so now resolved cset will be orphan as it will be based on the obsolete parent. Some users might not like the evolve to automatically resolve this orphan instability as well (while they only wanted to resolve the divergence), which is why we are providing this config. REPOSITORY rHG Mercurial BRANCH default REVISION DETAIL https://phab.mercurial-scm.org/D10019 AFFECTED FILES mercurial/configitems.py CHANGE DETAILS To: khanchi97, #hg-reviewers Cc: mercurial-patches, mercurial-devel