Mercurial > hg > mercurial-crew-with-dirclash

comparison mercurial/merge.py @ 4999:60c54154ec4c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge: don't forget to update the dirstate for exec bit changes
author Matt Mackall <mpm@selenic.com>
date Thu, 26 Jul 2007 11:19:53 -0500
parents 931f901ab811
children 54ff1bb4b53a f191bc3916f7
comparison
equal deleted inserted replaced
4966:8d982aef0be1 4999:60c54154ec4c
450 repo.dirstate.update([f], 'r') 450 repo.dirstate.update([f], 'r')
451 else: 451 else:
452 repo.dirstate.forget([f]) 452 repo.dirstate.forget([f])
453 elif m == "f": # forget 453 elif m == "f": # forget
454 repo.dirstate.forget([f]) 454 repo.dirstate.forget([f])
455 elif m == "g": # get 455 elif m in "ge": # get or exec change
456 if branchmerge: 456 if branchmerge:
457 repo.dirstate.update([f], 'n', st_mtime=-1) 457 repo.dirstate.update([f], 'n', st_mtime=-1)
458 else: 458 else:
459 repo.dirstate.update([f], 'n') 459 repo.dirstate.update([f], 'n')
460 elif m == "m": # merge 460 elif m == "m": # merge