Comments
Patch
@@ -209,10 +209,6 @@ def rebase(ui, repo, **opts):
_("can't remove original changesets with"
" unrebased descendants"),
hint=_('use --keep to keep original changesets'))
- elif not keepf and not repo[root].mutable():
- raise util.Abort(_("can't rebase immutable changeset %s")
- % repo[root],
- hint=_('see hg help phases for details'))
else:
result = buildstate(repo, dest, rebaseset, collapsef)
@@ -220,6 +216,10 @@ def rebase(ui, repo, **opts):
# Empty state built, nothing to rebase
ui.status(_('nothing to rebase\n'))
return 1
+ elif not keepf and not repo[root].mutable():
+ raise util.Abort(_("can't rebase immutable changeset %s")
+ % repo[root],
+ hint=_('see hg help phases for details'))
else:
originalwd, target, state = result
if collapsef:
@@ -276,6 +276,9 @@ C onto A - rebase onto an ancestor:
Check rebasing public changeset
$ hg pull --config phases.publish=True -q -r 6 . # update phase of 6
+ $ hg rebase -d 0 -b 6
+ nothing to rebase
+ [1]
$ hg rebase -d 5 -b 6
abort: can't rebase immutable changeset e1c4361dd923
(see hg help phases for details)