equal
deleted
inserted
replaced
208 raise util.Abort( |
208 raise util.Abort( |
209 _("can't remove original changesets with" |
209 _("can't remove original changesets with" |
210 " unrebased descendants"), |
210 " unrebased descendants"), |
211 hint=_('use --keep to keep original changesets')) |
211 hint=_('use --keep to keep original changesets')) |
212 elif not keepf and not repo[root].mutable(): |
212 elif not keepf and not repo[root].mutable(): |
213 raise util.Abort(_("Can't rebase immutable changeset %s") |
213 raise util.Abort(_("can't rebase immutable changeset %s") |
214 % repo[root], |
214 % repo[root], |
215 hint=_('see hg help phases for details')) |
215 hint=_('see hg help phases for details')) |
216 else: |
216 else: |
217 result = buildstate(repo, dest, rebaseset, detachf) |
217 result = buildstate(repo, dest, rebaseset, detachf) |
218 |
218 |