Mercurial > public > mercurial-scm > hg-stable

comparison mercurial/merge.py @ 2972:ad558f297eb1

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge: simplify some update logic
author Matt Mackall <mpm@selenic.com>
date Tue, 22 Aug 2006 16:47:27 -0500
parents 33dcf03ef45f
children a31557193f3c
comparison
equal deleted inserted replaced
2971:33dcf03ef45f 2972:ad558f297eb1
153 153
154 # are files different? 154 # are files different?
155 if n != m2[f]: 155 if n != m2[f]:
156 a = ma.get(f, nullid) 156 a = ma.get(f, nullid)
157 # are both different from the ancestor? 157 # are both different from the ancestor?
158 if n != a and m2[f] != a: 158 if not overwrite and n != a and m2[f] != a:
159 repo.ui.debug(_(" %s versions differ, resolve\n") % f) 159 repo.ui.debug(_(" %s versions differ, resolve\n") % f)
160 merge[f] = (fmerge(f, mw, m2, ma), m1.get(f, nullid), m2[f]) 160 merge[f] = (fmerge(f, mw, m2, ma), m1.get(f, nullid), m2[f])
161 queued = 1 161 queued = 1
162 # are we clobbering? 162 # are we clobbering?
163 # is remote's version newer? 163 # is remote's version newer?
230 repo.ui.debug(_("local deleted %s\n") % f) 230 repo.ui.debug(_("local deleted %s\n") % f)
231 231
232 del mw, m1, m2, ma 232 del mw, m1, m2, ma
233 233
234 ### apply phase 234 ### apply phase
235
236 if overwrite:
237 for f in merge:
238 get[f] = merge[f][:2]
239 merge = {}
240 235
241 if linear_path or overwrite: 236 if linear_path or overwrite:
242 # we don't need to do any magic, just jump to the new rev 237 # we don't need to do any magic, just jump to the new rev
243 p1, p2 = p2, nullid 238 p1, p2 = p2, nullid
244 239