Mercurial > public > mercurial-scm > hg-stable
comparison mercurial/merge.py @ 13728:15d1db2abfcb
merge with stable
| author | Matt Mackall <mpm@selenic.com> |
|---|---|
| date | Wed, 23 Mar 2011 09:20:40 -0500 |
| parents | 0ab0ceefddf2 5b3383ea67d2 |
| children | 9d67277c9204 |
comparison
equal
deleted
inserted
replaced
| 13727:ce47a0c10224 | 13728:15d1db2abfcb |
|---|---|
| 336 if r is None: | 336 if r is None: |
| 337 updated += 1 | 337 updated += 1 |
| 338 else: | 338 else: |
| 339 merged += 1 | 339 merged += 1 |
| 340 util.set_flags(repo.wjoin(fd), 'l' in flags, 'x' in flags) | 340 util.set_flags(repo.wjoin(fd), 'l' in flags, 'x' in flags) |
| 341 if f != fd and move and os.path.lexists(repo.wjoin(f)): | 341 if (move and repo.dirstate.normalize(fd) != f |
| 342 and os.path.lexists(repo.wjoin(f))): | |
| 342 repo.ui.debug("removing %s\n" % f) | 343 repo.ui.debug("removing %s\n" % f) |
| 343 os.unlink(repo.wjoin(f)) | 344 os.unlink(repo.wjoin(f)) |
| 344 elif m == "g": # get | 345 elif m == "g": # get |
| 345 flags = a[2] | 346 flags = a[2] |
| 346 repo.ui.note(_("getting %s\n") % f) | 347 repo.ui.note(_("getting %s\n") % f) |