Show More
@@ -565,10 +565,11 b' def restorestatus(repo):' | |||
|
565 | 565 | def abort(repo, originalwd, target, state): |
|
566 | 566 | 'Restore the repository to its original state' |
|
567 | 567 | dstates = [s for s in state.values() if s != nullrev] |
|
568 |
i |
|
|
569 | repo.ui.warn(_("warning: immutable rebased changeset detected, " | |
|
570 | "can't abort\n")) | |
|
571 | return -1 | |
|
568 | immutable = [d for d in dstates if not repo[d].mutable()] | |
|
569 | if immutable: | |
|
570 | raise util.Abort(_("can't abort rebase due to immutable changesets %s") | |
|
571 | % ', '.join(str(repo[r]) for r in immutable), | |
|
572 | hint=_('see hg help phases for details')) | |
|
572 | 573 | |
|
573 | 574 | descendants = set() |
|
574 | 575 | if dstates: |
@@ -248,7 +248,8 b" Change phase on B and B'" | |||
|
248 | 248 | Abort the rebasing: |
|
249 | 249 | |
|
250 | 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 | 253 | [255] |
|
253 | 254 | |
|
254 | 255 | $ hg tglogp |
General Comments 0
You need to be logged in to leave comments.
Login now