changeset 5915 | d0576d065993 |
parent 5843 | 83c354c4d529 |
child 6048 | cfb4a51da7d5 |
--- a/mercurial/dirstate.py Mon Jan 21 13:37:27 2008 -0200 +++ b/mercurial/dirstate.py Sun Jan 20 14:39:25 2008 +0100 @@ -235,7 +235,7 @@ self._changepath(f, 'n', True) s = os.lstat(self._join(f)) self._map[f] = ('n', s.st_mode, s.st_size, s.st_mtime, 0) - if self._copymap.has_key(f): + if f in self._copymap: del self._copymap[f] def normallookup(self, f):