Mercurial > hg > mercurial-crew-with-dirclash
comparison mercurial/commands.py @ 895:77b52b864249
Merge walk changes with Matt's tip.
author | Bryan O'Sullivan <bos@serpentine.com> |
---|---|
date | Sat, 13 Aug 2005 15:26:32 -0800 |
parents | 391de0bcc722 62ec665759f2 |
children | 01215ad04283 |
comparison
equal
deleted
inserted
replaced
890:391de0bcc722 | 895:77b52b864249 |
---|---|
460 dest = os.path.basename(os.path.normpath(source)) | 460 dest = os.path.basename(os.path.normpath(source)) |
461 | 461 |
462 if os.path.exists(dest): | 462 if os.path.exists(dest): |
463 ui.warn("abort: destination '%s' already exists\n" % dest) | 463 ui.warn("abort: destination '%s' already exists\n" % dest) |
464 return 1 | 464 return 1 |
465 | |
466 dest = os.path.realpath(dest) | |
465 | 467 |
466 class Dircleanup: | 468 class Dircleanup: |
467 def __init__(self, dir_): | 469 def __init__(self, dir_): |
468 self.rmtree = shutil.rmtree | 470 self.rmtree = shutil.rmtree |
469 self.dir_ = dir_ | 471 self.dir_ = dir_ |