Mercurial > hg > mercurial-crew-with-dirclash
changeset 4374:de612b5f8d59
Make copy --after work for files that have been hg added.
author | Brendan Cully <brendan@kublai.com> |
---|---|
date | Tue, 24 Apr 2007 18:43:18 -0700 |
parents | 109077e7048d |
children | 4759da3e4dc8 f4af7960d578 |
files | mercurial/commands.py tests/test-copy2 tests/test-copy2.out |
diffstat | 3 files changed, 10 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial/commands.py +++ b/mercurial/commands.py @@ -503,7 +503,7 @@ def docopy(ui, repo, pats, opts, wlock): util.localpath(prevsrc))) return if (not opts['after'] and os.path.exists(reltarget) or - opts['after'] and repo.dirstate.state(abstarget) not in '?r'): + opts['after'] and repo.dirstate.state(abstarget) not in '?ar'): if not opts['force']: ui.warn(_('%s: not overwriting - file exists\n') % reltarget)