Mercurial > public > mercurial-scm > hg

comparison mercurial/merge.py @ 5489:3ab405e070bb

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Honour the exec bit when we go back in time. Fixes issue801.
author Alexis S. L. Carvalho <alexis@cecm.usp.br>
date Mon, 05 Nov 2007 18:49:35 -0200
parents f9c2917a9f7a
children 78a6b985882f 840e2b315c1f
comparison
equal deleted inserted replaced
5488:247af577fe29 5489:3ab405e070bb
399 # local is newer, not overwrite, check mode bits 399 # local is newer, not overwrite, check mode bits
400 elif fmerge(f) != m1.flags(f): 400 elif fmerge(f) != m1.flags(f):
401 act("update permissions", "e", f, m2.flags(f)) 401 act("update permissions", "e", f, m2.flags(f))
402 # contents same, check mode bits 402 # contents same, check mode bits
403 elif m1.flags(f) != m2.flags(f): 403 elif m1.flags(f) != m2.flags(f):
404 if overwrite or fmerge(f) != m1.flags(f): 404 # are we clobbering?
405 # is remote's version newer?
406 # or are we going back?
407 if overwrite or fmerge(f) != m1.flags(f) or backwards:
405 act("update permissions", "e", f, m2.flags(f)) 408 act("update permissions", "e", f, m2.flags(f))
406 elif f in copied: 409 elif f in copied:
407 continue 410 continue
408 elif f in copy: 411 elif f in copy:
409 f2 = copy[f] 412 f2 = copy[f]