##// END OF EJS Templates
rebase: improve error message on improper phases...
Dan Villiom Podlaski Christiansen -
r17026:f8af57c0 stable
parent child Browse files
Show More
@@ -565,10 +565,11 b' def restorestatus(repo):'
565 def abort(repo, originalwd, target, state):
565 def abort(repo, originalwd, target, state):
566 'Restore the repository to its original state'
566 'Restore the repository to its original state'
567 dstates = [s for s in state.values() if s != nullrev]
567 dstates = [s for s in state.values() if s != nullrev]
568 if [d for d in dstates if not repo[d].mutable()]:
568 immutable = [d for d in dstates if not repo[d].mutable()]
569 repo.ui.warn(_("warning: immutable rebased changeset detected, "
569 if immutable:
570 "can't abort\n"))
570 raise util.Abort(_("can't abort rebase due to immutable changesets %s")
571 return -1
571 % ', '.join(str(repo[r]) for r in immutable),
572 hint=_('see hg help phases for details'))
572
573
573 descendants = set()
574 descendants = set()
574 if dstates:
575 if dstates:
@@ -248,7 +248,8 b" Change phase on B and B'"
248 Abort the rebasing:
248 Abort the rebasing:
249
249
250 $ hg rebase --abort
250 $ hg rebase --abort
251 warning: immutable rebased changeset detected, can't abort
251 abort: can't abort rebase due to immutable changesets 45396c49d53b
252 (see hg help phases for details)
252 [255]
253 [255]
253
254
254 $ hg tglogp
255 $ hg tglogp
General Comments 0
You need to be logged in to leave comments. Login now