Mercurial > hg

diff hgext/histedit.py @ 27344:43c00ca887d1

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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
line wrap: on
line diff
--- a/hgext/histedit.py	Sat Dec 12 09:57:05 2015 -0800
+++ b/hgext/histedit.py	Mon Dec 14 18:54:03 2015 -0500
@@ -712,8 +712,8 @@
 
     def run(self):
         if self.repo['.'].node() != self.node:
-            mergemod.update(self.repo, self.node, False, True, False)
-            #                                     branchmerge, force, partial)
+            mergemod.update(self.repo, self.node, False, True)
+            #                                     branchmerge, force)
         return self.continueclean()
 
     def continuedirty(self):