hgext/histedit.py
changeset 40029 e2697acd9381
parent 39914 b153ca77a52b
child 40293 c303d65d2e34
equal deleted inserted replaced
40028:51f10e6d66c7 40029:e2697acd9381
   908 
   908 
   909     outgoing = discovery.findcommonoutgoing(repo, other, revs, force=force)
   909     outgoing = discovery.findcommonoutgoing(repo, other, revs, force=force)
   910     if not outgoing.missing:
   910     if not outgoing.missing:
   911         raise error.Abort(_('no outgoing ancestors'))
   911         raise error.Abort(_('no outgoing ancestors'))
   912     roots = list(repo.revs("roots(%ln)", outgoing.missing))
   912     roots = list(repo.revs("roots(%ln)", outgoing.missing))
   913     if 1 < len(roots):
   913     if len(roots) > 1:
   914         msg = _('there are ambiguous outgoing revisions')
   914         msg = _('there are ambiguous outgoing revisions')
   915         hint = _("see 'hg help histedit' for more detail")
   915         hint = _("see 'hg help histedit' for more detail")
   916         raise error.Abort(msg, hint=hint)
   916         raise error.Abort(msg, hint=hint)
   917     return repo[roots[0]].node()
   917     return repo[roots[0]].node()
   918 
   918