Mercurial > hg > gitserve

changeset 3312:5c9806554d65

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge: finish removing nodes from action list
author Matt Mackall <mpm@selenic.com>
date Tue, 10 Oct 2006 00:22:03 -0500
parents 0708bdb4987a
children f009a6f12a59
files mercurial/merge.py
diffstat 1 files changed, 5 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/mercurial/merge.py	Tue Oct 10 00:07:46 2006 -0500
+++ b/mercurial/merge.py	Tue Oct 10 00:22:03 2006 -0500
@@ -215,7 +215,7 @@
                 # is remote's version newer?
                 # or are we going back in time and clean?
                 elif overwrite or m2[f] != a or (backwards and not n[20:]):
-                    act("remote is newer", f, "g", m2.execf(f), m2[f])
+                    act("remote is newer", f, "g", m2.execf(f))
                 # local is newer, not overwrite, check mode bits
                 elif fmerge(f) != m1.execf(f):
                     act("update permissions", f, "e", m2.execf(f))
@@ -261,14 +261,14 @@
             act("remote copied", f2, "c", f, f, fmerge(f2, f, f2), False)
         elif f in ma:
             if overwrite or backwards:
-                act("recreating", f, "g", m2.execf(f), n)
+                act("recreating", f, "g", m2.execf(f))
             elif n != ma[f]:
                 if repo.ui.prompt(
                     (_("remote changed %s which local deleted\n") % f) +
                     _("(k)eep or (d)elete?"), _("[kd]"), _("k")) == _("k"):
-                    act("prompt recreating", f, "g", m2.execf(f), n)
+                    act("prompt recreating", f, "g", m2.execf(f))
         else:
-            act("remote created", f, "g", m2.execf(f), n)
+            act("remote created", f, "g", m2.execf(f))
 
     return action
 
@@ -304,7 +304,7 @@
             util.set_exec(repo.wjoin(f), flag)
             merged += 1
         elif m == "g": # get
-            flag, node = a[2:]
+            flag = a[2]
             repo.ui.note(_("getting %s\n") % f)
             t = mctx.filectx(f).data()
             repo.wwrite(f, t)