##// END OF EJS Templates
config: gather allowdivergence under the evolution namespace...
Boris Feld -
r34873:29f52e79 default
parent child Browse files
Show More
@@ -1061,7 +1061,7 b' def _checkobsrebase(repo, ui, rebaseobsr'
1061 """
1061 """
1062 # Obsolete node with successors not in dest leads to divergence
1062 # Obsolete node with successors not in dest leads to divergence
1063 divergenceok = ui.configbool('experimental',
1063 divergenceok = ui.configbool('experimental',
1064 'allowdivergence')
1064 'evolution.allowdivergence')
1065 divergencebasecandidates = rebaseobsrevs - rebaseobsskipped
1065 divergencebasecandidates = rebaseobsrevs - rebaseobsskipped
1066
1066
1067 if divergencebasecandidates and not divergenceok:
1067 if divergencebasecandidates and not divergenceok:
@@ -1070,7 +1070,7 b' def _checkobsrebase(repo, ui, rebaseobsr'
1070 msg = _("this rebase will cause "
1070 msg = _("this rebase will cause "
1071 "divergences from: %s")
1071 "divergences from: %s")
1072 h = _("to force the rebase please set "
1072 h = _("to force the rebase please set "
1073 "experimental.allowdivergence=True")
1073 "experimental.evolution.allowdivergence=True")
1074 raise error.Abort(msg % (",".join(divhashes),), hint=h)
1074 raise error.Abort(msg % (",".join(divhashes),), hint=h)
1075
1075
1076 def successorrevs(unfi, rev):
1076 def successorrevs(unfi, rev):
@@ -300,9 +300,6 b" coreconfigitem('email', 'method',"
300 coreconfigitem('email', 'reply-to',
300 coreconfigitem('email', 'reply-to',
301 default=None,
301 default=None,
302 )
302 )
303 coreconfigitem('experimental', 'allowdivergence',
304 default=False,
305 )
306 coreconfigitem('experimental', 'archivemetatemplate',
303 coreconfigitem('experimental', 'archivemetatemplate',
307 default=dynamicdefault,
304 default=dynamicdefault,
308 )
305 )
@@ -348,6 +345,10 b" coreconfigitem('experimental', 'editortm"
348 coreconfigitem('experimental', 'evolution',
345 coreconfigitem('experimental', 'evolution',
349 default=list,
346 default=list,
350 )
347 )
348 coreconfigitem('experimental', 'evolution.allowdivergence',
349 default=False,
350 alias=[('experimental', 'allowdivergence')]
351 )
351 coreconfigitem('experimental', 'evolution.allowunstable',
352 coreconfigitem('experimental', 'evolution.allowunstable',
352 default=None,
353 default=None,
353 )
354 )
@@ -1707,7 +1707,7 b' have a definite end point.'
1707 ``rebase``
1707 ``rebase``
1708 ----------
1708 ----------
1709
1709
1710 ``allowdivergence``
1710 ``evolution.allowdivergence``
1711 Default to False, when True allow creating divergence when performing
1711 Default to False, when True allow creating divergence when performing
1712 rebase of obsolete changesets.
1712 rebase of obsolete changesets.
1713
1713
@@ -826,7 +826,7 b' If a rebase is going to create divergenc'
826 orphan: 1 changesets
826 orphan: 1 changesets
827 $ hg rebase -s 10 -d 12
827 $ hg rebase -s 10 -d 12
828 abort: this rebase will cause divergences from: 121d9e3bc4c6
828 abort: this rebase will cause divergences from: 121d9e3bc4c6
829 (to force the rebase please set experimental.allowdivergence=True)
829 (to force the rebase please set experimental.evolution.allowdivergence=True)
830 [255]
830 [255]
831 $ hg log -G
831 $ hg log -G
832 @ 14:73568ab6879d bar foo
832 @ 14:73568ab6879d bar foo
@@ -845,9 +845,9 b' If a rebase is going to create divergenc'
845 |
845 |
846 o 0:4a2df7238c3b A
846 o 0:4a2df7238c3b A
847
847
848 With experimental.allowdivergence=True, rebase can create divergence
848 With experimental.evolution.allowdivergence=True, rebase can create divergence
849
849
850 $ hg rebase -s 10 -d 12 --config experimental.allowdivergence=True
850 $ hg rebase -s 10 -d 12 --config experimental.evolution.allowdivergence=True
851 rebasing 10:121d9e3bc4c6 "P"
851 rebasing 10:121d9e3bc4c6 "P"
852 rebasing 14:73568ab6879d "bar foo" (tip)
852 rebasing 14:73568ab6879d "bar foo" (tip)
853 $ hg summary
853 $ hg summary
General Comments 0
You need to be logged in to leave comments. Login now