Mercurial > hg

changeset 2893:3cef09d12010

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge: working manifest new/changed To remove dependence on m1 during manifest comparison, we distinguish between new and changed states in mw.
author Matt Mackall <mpm@selenic.com>
date Tue, 15 Aug 2006 16:12:51 -0500
parents dd41ad984f71
children f28f4c850cd8
files mercurial/merge.py
diffstat 1 files changed, 4 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/mercurial/merge.py	Tue Aug 15 15:58:10 2006 -0500
+++ b/mercurial/merge.py	Tue Aug 15 16:12:51 2006 -0500
@@ -116,7 +116,8 @@
     umap = dict.fromkeys(unknown)
 
     for f in added + modified + unknown:
-        mw[f] = ""
+        mw[f] = None
+        if f in m1: mw[f] = "" # distinguish between changed and new
         mw.set(f, util.is_exec(repo.wjoin(f), mw.execf(f)))
 
     for f in deleted + removed:
@@ -138,8 +139,8 @@
         if f in m2:
             s = 0
 
-            # is the wfile new since m1, and match m2?
-            if f not in m1:
+            # is the wfile new and matches m2?
+            if mw[f] == None:
                 if not repo.file(f).cmp(m2[f], repo.wread(f)):
                     n = m2[f]