Mercurial > hg > mercurial-crew-with-dirclash

comparison mercurial/merge.py @ 2998:833677bc9791

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge: rename mysterious variable
author Matt Mackall <mpm@selenic.com>
date Mon, 21 Aug 2006 14:25:56 -0500
parents 545d33aa3f82
children fa9c769fee8a
comparison
equal deleted inserted replaced
2997:545d33aa3f82 2998:833677bc9791
143 # Compare manifests 143 # Compare manifests
144 for f, n in mw.iteritems(): 144 for f, n in mw.iteritems():
145 if partial and not partial(f): 145 if partial and not partial(f):
146 continue 146 continue
147 if f in m2: 147 if f in m2:
148 s = 0 148 queued = 0
149 149
150 # are files different? 150 # are files different?
151 if n != m2[f]: 151 if n != m2[f]:
152 a = ma.get(f, nullid) 152 a = ma.get(f, nullid)
153 # are both different from the ancestor? 153 # are both different from the ancestor?
154 if n != a and m2[f] != a: 154 if n != a and m2[f] != a:
155 repo.ui.debug(_(" %s versions differ, resolve\n") % f) 155 repo.ui.debug(_(" %s versions differ, resolve\n") % f)
156 merge[f] = (fmerge(f, mw, m2, ma), m1.get(f, nullid), m2[f]) 156 merge[f] = (fmerge(f, mw, m2, ma), m1.get(f, nullid), m2[f])
157 s = 1 157 queued = 1
158 # are we clobbering? 158 # are we clobbering?
159 # is remote's version newer? 159 # is remote's version newer?
160 # or are we going back in time and clean? 160 # or are we going back in time and clean?
161 elif overwrite or m2[f] != a or (backwards and mw[f] == m1[f]): 161 elif overwrite or m2[f] != a or (backwards and mw[f] == m1[f]):
162 repo.ui.debug(_(" remote %s is newer, get\n") % f) 162 repo.ui.debug(_(" remote %s is newer, get\n") % f)
163 get[f] = (m2.execf(f), m2[f]) 163 get[f] = (m2.execf(f), m2[f])
164 s = 1 164 queued = 1
165 elif f in umap or f in added: 165 elif f in umap or f in added:
166 # this unknown file is the same as the checkout 166 # this unknown file is the same as the checkout
167 # we need to reset the dirstate if the file was added 167 # we need to reset the dirstate if the file was added
168 get[f] = (m2.execf(f), m2[f]) 168 get[f] = (m2.execf(f), m2[f])
169 169
170 if not s and mw.execf(f) != m2.execf(f): 170 # do we still need to look at mode bits?
171 if not queued and mw.execf(f) != m2.execf(f):
171 if overwrite: 172 if overwrite:
172 repo.ui.debug(_(" updating permissions for %s\n") % f) 173 repo.ui.debug(_(" updating permissions for %s\n") % f)
173 util.set_exec(repo.wjoin(f), m2.execf(f)) 174 util.set_exec(repo.wjoin(f), m2.execf(f))
174 else: 175 else:
175 if fmerge(f, mw, m2, ma) != mw.execf(f): 176 if fmerge(f, mw, m2, ma) != mw.execf(f):