Mercurial > hg > mercurial-crew-with-dirclash
comparison mercurial/merge.py @ 3295:764688cf51e5
merge: remember rename copies and parents properly on commit
record copies in dirstate even if rename was remote
this lets us record it properly at commit
teach checkfilemerge about copies, including merge cases
pull old copy code out of commit
extend rename-merge1 test to show file index
| author | Matt Mackall <mpm@selenic.com> |
|---|---|
| date | Sun, 08 Oct 2006 19:57:45 -0500 |
| parents | ae85272b59a4 |
| children | 72d1e521da77 |
comparison
equal
deleted
inserted
replaced
| 3291:0b5d626b354e | 3295: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 |