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