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