Mercurial > hg > mercurial-crew-with-dirclash

comparison mercurial/merge.py @ 3002:a31557193f3c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge: simplify working dir manifest generation
author Matt Mackall <mpm@selenic.com>
date Tue, 22 Aug 2006 17:08:38 -0500
parents ad558f297eb1
children cbb90f4bafb0
comparison
equal deleted inserted replaced
3001:ad558f297eb1 3002:a31557193f3c
119 mw = m1.copy() 119 mw = m1.copy()
120 umap = dict.fromkeys(unknown) 120 umap = dict.fromkeys(unknown)
121 121
122 for f in added + modified + unknown: 122 for f in added + modified + unknown:
123 mw[f] = "" 123 mw[f] = ""
124 # is the wfile new and matches m2?
125 if (f not in m1 and f in m2 and
126 not repo.file(f).cmp(m2[f], repo.wread(f))):
127 mw[f] = m2[f]
128
129 mw.set(f, util.is_exec(repo.wjoin(f), mw.execf(f))) 124 mw.set(f, util.is_exec(repo.wjoin(f), mw.execf(f)))
130 125
131 for f in deleted + removed: 126 for f in deleted + removed:
132 if f in mw: 127 if f in mw:
133 del mw[f] 128 del mw[f]