equal
deleted
inserted
replaced
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) |