equal
deleted
inserted
replaced
710 def constraints(self): |
710 def constraints(self): |
711 return set([_constraints.forceother]) |
711 return set([_constraints.forceother]) |
712 |
712 |
713 def run(self): |
713 def run(self): |
714 if self.repo['.'].node() != self.node: |
714 if self.repo['.'].node() != self.node: |
715 mergemod.update(self.repo, self.node, False, True, False) |
715 mergemod.update(self.repo, self.node, False, True) |
716 # branchmerge, force, partial) |
716 # branchmerge, force) |
717 return self.continueclean() |
717 return self.continueclean() |
718 |
718 |
719 def continuedirty(self): |
719 def continuedirty(self): |
720 abortdirty() |
720 abortdirty() |
721 |
721 |