hgext/histedit.py
changeset 40366 b14fdf1fb615
parent 40293 c303d65d2e34
child 40602 c36175456350
equal deleted inserted replaced
40365:4f37af86d5d5 40366:b14fdf1fb615
   828         _('checkout changeset and apply further changesets from there'))
   828         _('checkout changeset and apply further changesets from there'))
   829 class base(histeditaction):
   829 class base(histeditaction):
   830 
   830 
   831     def run(self):
   831     def run(self):
   832         if self.repo['.'].node() != self.node:
   832         if self.repo['.'].node() != self.node:
   833             mergemod.update(self.repo, self.node, False, True)
   833             mergemod.update(self.repo, self.node, branchmerge=False, force=True)
   834             #                                     branchmerge, force)
       
   835         return self.continueclean()
   834         return self.continueclean()
   836 
   835 
   837     def continuedirty(self):
   836     def continuedirty(self):
   838         abortdirty()
   837         abortdirty()
   839 
   838