hgext/evolve.py
branchstable
changeset 548 bebc6753e7b9
parent 546 415540dee2bd
child 549 b047e9417d96
equal deleted inserted replaced
547:c4abb0218e84 548:bebc6753e7b9
  1007     rebaseset = repo.revs('%ld - extinct()', rebaseset)
  1007     rebaseset = repo.revs('%ld - extinct()', rebaseset)
  1008     if not rebaseset:
  1008     if not rebaseset:
  1009         repo.ui.warn(_('whole rebase set is extinct and ignored.\n'))
  1009         repo.ui.warn(_('whole rebase set is extinct and ignored.\n'))
  1010         return {}
  1010         return {}
  1011     root = min(rebaseset)
  1011     root = min(rebaseset)
  1012     if not repo._rebasekeep and not repo[root].mutable():
  1012     if (not getattr(repo, '_rebasekeep', False)
       
  1013         and not repo[root].mutable()):
  1013         raise util.Abort(_("can't rebase immutable changeset %s") % repo[root],
  1014         raise util.Abort(_("can't rebase immutable changeset %s") % repo[root],
  1014                          hint=_('see hg help phases for details'))
  1015                          hint=_('see hg help phases for details'))
  1015     return orig(repo, dest, rebaseset, *ags, **kws)
  1016     return orig(repo, dest, rebaseset, *ags, **kws)
  1016 
  1017 
  1017 def defineparents(orig, repo, rev, target, state, *args, **kwargs):
  1018 def defineparents(orig, repo, rev, target, state, *args, **kwargs):