changeset 14434 | cc8c09855d19 |
parent 14365 | a8e3931e3fb5 |
child 14482 | 58b36e9ea783 |
--- 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: