Mercurial Mercurial > mercurial / diff
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
mercurial/localrepo.py
changeset 5207 212de429e000
parent 5206 6a1d2dd96b8e
child 5210 90d9ec0dc69d 
--- a/mercurial/localrepo.py	Tue Aug 21 02:02:08 2007 +0200
+++ b/mercurial/localrepo.py	Tue Aug 21 02:13:32 2007 +0200
@@ -997,6 +997,8 @@
                                    "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:
mercurial