Mercurial > public > mercurial-scm > hg

diff mercurial/commands.py @ 4376:de612b5f8d59

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 aa26759c6fb3
children e89f9afc462b f4af7960d578
line wrap: on
line diff
--- a/mercurial/commands.py	Tue Apr 24 12:02:51 2007 -0700
+++ b/mercurial/commands.py	Tue Apr 24 18:43:18 2007 -0700
@@ -503,7 +503,7 @@
                      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)