equal
deleted
inserted
replaced
400 else: |
400 else: |
401 if r is None: |
401 if r is None: |
402 updated += 1 |
402 updated += 1 |
403 else: |
403 else: |
404 merged += 1 |
404 merged += 1 |
405 if (move and repo.dirstate.normalize(fd) != f |
|
406 and os.path.lexists(repo.wjoin(f))): |
|
407 repo.ui.debug("removing %s\n" % f) |
|
408 audit(f) |
|
409 os.unlink(repo.wjoin(f)) |
|
410 elif m == "g": # get |
405 elif m == "g": # get |
411 flags = a[2] |
406 flags = a[2] |
412 repo.ui.note(_("getting %s\n") % f) |
407 repo.ui.note(_("getting %s\n") % f) |
413 t = mctx.filectx(f).data() |
408 t = mctx.filectx(f).data() |
414 repo.wwrite(f, t, flags) |
409 repo.wwrite(f, t, flags) |