Mercurial > public > mercurial-scm > hg

diff mercurial/commands.py @ 1634:f49f602fae92

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
copy & rename can ignore removed source files As mercurial now distinguishes deleted files from removed files, we can skip removed source files while copying or renaming.
author Robin Farine <robin.farine@terminus.org>
date Tue, 24 Jan 2006 13:59:01 +1300
parents 94c179a92f4a
children 3b1b44b917f4
line wrap: on
line diff
--- a/mercurial/commands.py	Tue Jan 24 13:57:09 2006 +1300
+++ b/mercurial/commands.py	Tue Jan 24 13:59:01 2006 +1300
@@ -804,7 +804,8 @@
 
     def okaytocopy(abs, rel, exact):
         reasons = {'?': _('is not managed'),
-                   'a': _('has been marked for add')}
+                   'a': _('has been marked for add'),
+                   'r': _('has been marked for remove')}
         reason = reasons.get(repo.dirstate.state(abs))
         if reason:
             if exact: