Mercurial > public > mercurial-scm > hg-stable

diff mercurial/localrepo.py @ 14434:cc8c09855d19

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
dirstate: rename forget to drop It has substantially different semantics from forget at the command layer, so change it to avoid confusion. We can't simply combine it with remove because we need to explicitly drop non-added files in some cases like commit.
author Matt Mackall <mpm@selenic.com>
date Thu, 26 May 2011 17:15:35 -0500
parents a8e3931e3fb5
children 58b36e9ea783
line wrap: on
line diff
--- a/mercurial/localrepo.py	Thu May 26 10:46:34 2011 +0200
+++ b/mercurial/localrepo.py	Thu May 26 17:15:35 2011 -0500
@@ -1037,7 +1037,7 @@
             for f in changes[0] + changes[1]:
                 self.dirstate.normal(f)
             for f in changes[2]:
-                self.dirstate.forget(f)
+                self.dirstate.drop(f)
             self.dirstate.setparents(ret)
             ms.reset()
         finally: