Mercurial > public > mercurial-scm > hg-stable
diff hgext/rebase.py @ 34872:29f52e7966dd
config: gather allowdivergence under the evolution namespace
Grouping all evolution related-config under the experimental.evolution
namespace would helps the future migration outside [experimental].
Differential Revision: https://phab.mercurial-scm.org/D1155
| author | Boris Feld <boris.feld@octobus.net> |
|---|---|
| date | Tue, 17 Oct 2017 16:54:31 +0200 |
| parents | 44c4ed4ad032 |
| children | c858afe9c59b |
line wrap: on
line diff
--- a/hgext/rebase.py Tue Oct 17 15:57:56 2017 +0200 +++ b/hgext/rebase.py Tue Oct 17 16:54:31 2017 +0200 @@ -1061,7 +1061,7 @@ """ # Obsolete node with successors not in dest leads to divergence divergenceok = ui.configbool('experimental', - 'allowdivergence') + 'evolution.allowdivergence') divergencebasecandidates = rebaseobsrevs - rebaseobsskipped if divergencebasecandidates and not divergenceok: @@ -1070,7 +1070,7 @@ msg = _("this rebase will cause " "divergences from: %s") h = _("to force the rebase please set " - "experimental.allowdivergence=True") + "experimental.evolution.allowdivergence=True") raise error.Abort(msg % (",".join(divhashes),), hint=h) def successorrevs(unfi, rev):