Mercurial > hg
comparison hgext/histedit.py @ 27344:43c00ca887d1
merge: have merge.update use a matcher instead of partial fn
This is relatively rarely used functionality, but migrating this to a
matcher will make future work on narrow clones more feasible.
author | Augie Fackler <augie@google.com> |
---|---|
date | Mon, 14 Dec 2015 18:54:03 -0500 |
parents | 3d0feb2f978b |
children | 50b6a04f817f |
comparison
equal
deleted
inserted
replaced
27343:c59647c6694d | 27344:43c00ca887d1 |
---|---|
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 |