Mercurial > hg > gitweb

comparison mercurial/merge.py @ 3106:4ec28446fca8

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge: remove now unused umap dict
author Matt Mackall <mpm@selenic.com>
date Sun, 17 Sep 2006 16:13:34 -0500
parents 7c7469d41ade
children 3bd05ad67f45
comparison
equal deleted inserted replaced
3105:7c7469d41ade 3106:4ec28446fca8
201 (short(p1), short(p2), short(pa))) 201 (short(p1), short(p2), short(pa)))
202 202
203 action = [] 203 action = []
204 204
205 # update m1 from working dir 205 # update m1 from working dir
206 umap = dict.fromkeys(unknown)
207
208 for i,l in (("a", added), ("m", modified), ("u", unknown)): 206 for i,l in (("a", added), ("m", modified), ("u", unknown)):
209 for f in l: 207 for f in l:
210 m1[f] = m1.get(f, nullid) + i 208 m1[f] = m1.get(f, nullid) + i
211 m1.set(f, util.is_exec(repo.wjoin(f), m1.execf(f))) 209 m1.set(f, util.is_exec(repo.wjoin(f), m1.execf(f)))
212 210