mercurial/merge.py
changeset 3292 764688cf51e5
parent 3252 ae85272b59a4
child 3295 72d1e521da77
equal deleted inserted replaced
3291:0b5d626b354e 3292:764688cf51e5
   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