mercurial/commands.py
changeset 18656 8eb3408bf005
parent 18623 0027a5cec9d0
child 18658 5e63a85299ba
equal deleted inserted replaced
18655:882681bc3166 18656:8eb3408bf005
  3810     wlock = lock = tr = None
  3810     wlock = lock = tr = None
  3811     msgs = []
  3811     msgs = []
  3812 
  3812 
  3813     def checkexact(repo, n, nodeid):
  3813     def checkexact(repo, n, nodeid):
  3814         if opts.get('exact') and hex(n) != nodeid:
  3814         if opts.get('exact') and hex(n) != nodeid:
  3815             repo.rollback()
       
  3816             raise util.Abort(_('patch is damaged or loses information'))
  3815             raise util.Abort(_('patch is damaged or loses information'))
  3817 
  3816 
  3818     def tryone(ui, hunk, parents):
  3817     def tryone(ui, hunk, parents):
  3819         tmpname, message, user, date, branch, nodeid, p1, p2 = \
  3818         tmpname, message, user, date, branch, nodeid, p1, p2 = \
  3820             patch.extract(ui, hunk)
  3819             patch.extract(ui, hunk)