Mercurial > hg > mercurial-crew-with-dirclash

diff mercurial/localrepo.py @ 5205:212de429e000

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
make hg add of a removed file unremove the file if a file was removed, hg add shouldn't mark the file as added, but as normal see issue683
author Benoit Boissinot <benoit.boissinot@ens-lyon.org>
date Tue, 21 Aug 2007 02:13:32 +0200
parents 6a1d2dd96b8e
children 90d9ec0dc69d
line wrap: on
line diff
--- a/mercurial/localrepo.py
+++ b/mercurial/localrepo.py
@@ -997,6 +997,8 @@ class localrepository(repo.repository):
                                    "supported currently\n") % f)
                 elif self.dirstate[f] in 'amn':
                     self.ui.warn(_("%s already tracked!\n") % f)
+                elif self.dirstate[f] == 'r':
+                    self.dirstate.normaldirty(f)
                 else:
                     self.dirstate.add(f)
         finally: