Mercurial > hg > mercurial-crew-with-dirclash

comparison mercurial/merge.py @ 3005:c67920d78248

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge: remove redundant if
author Matt Mackall <mpm@selenic.com>
date Tue, 22 Aug 2006 17:42:55 -0500
parents 31011730f9bd
children 87a0332ab58b
comparison
equal deleted inserted replaced
3004:31011730f9bd 3005:c67920d78248
121 for f in added + modified + unknown: 121 for f in added + modified + unknown:
122 m1[f] = m1.get(f, nullid) + "+" 122 m1[f] = m1.get(f, nullid) + "+"
123 m1.set(f, util.is_exec(repo.wjoin(f), m1.execf(f))) 123 m1.set(f, util.is_exec(repo.wjoin(f), m1.execf(f)))
124 124
125 for f in deleted + removed: 125 for f in deleted + removed:
126 if f in m1: 126 del m1[f]
127 del m1[f]
128 127
129 # If we're jumping between revisions (as opposed to merging), 128 # If we're jumping between revisions (as opposed to merging),
130 # and if neither the working directory nor the target rev has 129 # and if neither the working directory nor the target rev has
131 # the file, then we need to remove it from the dirstate, to 130 # the file, then we need to remove it from the dirstate, to
132 # prevent the dirstate from listing the file when it is no 131 # prevent the dirstate from listing the file when it is no