##// END OF EJS Templates
rebase: remove experimental option from 'rebase' config section...
Pierre-Yves David -
r28280:dc6032a1 default
parent child Browse files
Show More
@@ -306,7 +306,7 b' def rebase(ui, repo, **opts):'
306 306 rebaseobsskipped = set(obsoletenotrebased)
307 307
308 308 # Obsolete node with successors not in dest leads to divergence
309 divergenceok = ui.configbool('rebase',
309 divergenceok = ui.configbool('experimental',
310 310 'allowdivergence')
311 311 divergencebasecandidates = rebaseobsrevs - rebaseobsskipped
312 312
@@ -316,7 +316,7 b' def rebase(ui, repo, **opts):'
316 316 msg = _("this rebase will cause "
317 317 "divergences from: %s")
318 318 h = _("to force the rebase please set "
319 "rebase.allowdivergence=True")
319 "experimental.allowdivergence=True")
320 320 raise error.Abort(msg % (",".join(divhashes),), hint=h)
321 321
322 322 # - plain prune (no successor) changesets are rebased
@@ -772,7 +772,7 b' If a rebase is going to create divergenc'
772 772 unstable: 1 changesets
773 773 $ hg rebase -s 10 -d 12
774 774 abort: this rebase will cause divergences from: 121d9e3bc4c6
775 (to force the rebase please set rebase.allowdivergence=True)
775 (to force the rebase please set experimental.allowdivergence=True)
776 776 [255]
777 777 $ hg log -G
778 778 @ 15:73568ab6879d bar foo
@@ -791,9 +791,9 b' If a rebase is going to create divergenc'
791 791 |
792 792 o 0:4a2df7238c3b A
793 793
794 With rebase.allowdivergence=True, rebase can create divergence
794 With experimental.allowdivergence=True, rebase can create divergence
795 795
796 $ hg rebase -s 10 -d 12 --config rebase.allowdivergence=True
796 $ hg rebase -s 10 -d 12 --config experimental.allowdivergence=True
797 797 rebasing 10:121d9e3bc4c6 "P"
798 798 rebasing 15:73568ab6879d "bar foo" (tip)
799 799 $ hg summary
General Comments 0
You need to be logged in to leave comments. Login now