Mercurial > hg > mercurial-crew-with-dirclash
comparison mercurial/merge.py @ 5059:8d9bdcbb2b18
merge: avoid double deletion mentioned in issue636
| author | Matt Mackall <mpm@selenic.com> |
|---|---|
| date | Thu, 02 Aug 2007 12:29:10 -0500 |
| parents | f191bc3916f7 |
| children | 2ef14e29e538 ad6b97132b81 |
comparison
equal
deleted
inserted
replaced
| 5058:a3d6de2838de | 5059:8d9bdcbb2b18 |
|---|---|
| 413 else: | 413 else: |
| 414 if r is None: | 414 if r is None: |
| 415 updated += 1 | 415 updated += 1 |
| 416 else: | 416 else: |
| 417 merged += 1 | 417 merged += 1 |
| 418 if f != fd and move: | 418 util.set_exec(repo.wjoin(fd), "x" in flags) |
| 419 if f != fd and move and util.lexists(repo.wjoin(f)): | |
| 419 repo.ui.debug(_("removing %s\n") % f) | 420 repo.ui.debug(_("removing %s\n") % f) |
| 420 os.unlink(repo.wjoin(f)) | 421 os.unlink(repo.wjoin(f)) |
| 421 util.set_exec(repo.wjoin(fd), "x" in flags) | |
| 422 elif m == "g": # get | 422 elif m == "g": # get |
| 423 flags = a[2] | 423 flags = a[2] |
| 424 repo.ui.note(_("getting %s\n") % f) | 424 repo.ui.note(_("getting %s\n") % f) |
| 425 t = mctx.filectx(f).data() | 425 t = mctx.filectx(f).data() |
| 426 repo.wwrite(f, t, flags) | 426 repo.wwrite(f, t, flags) |