Mercurial > hg > mercurial-crew-with-dirclash

comparison mercurial/merge.py @ 3297:fa59d6763441

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge with upstream
author Benoit Boissinot <benoit.boissinot@ens-lyon.org>
date Mon, 09 Oct 2006 21:22:55 +0200
parents 764688cf51e5
children 72d1e521da77
comparison
equal deleted inserted replaced
3294:80654c248793 3297:fa59d6763441
357 repo.dirstate.update([fd], 'n', st_size=f_len, st_mtime=-1) 357 repo.dirstate.update([fd], 'n', st_size=f_len, st_mtime=-1)
358 if move: 358 if move:
359 repo.dirstate.update([f], 'r') 359 repo.dirstate.update([f], 'r')
360 if f != fd: 360 if f != fd:
361 repo.dirstate.copy(f, fd) 361 repo.dirstate.copy(f, fd)
362 else:
363 repo.dirstate.copy(f2, fd)
362 364
363 def update(repo, node, branchmerge=False, force=False, partial=None, 365 def update(repo, node, branchmerge=False, force=False, partial=None,
364 wlock=None, show_stats=True, remind=True): 366 wlock=None, show_stats=True, remind=True):
365 367
366 overwrite = force and not branchmerge 368 overwrite = force and not branchmerge