Mercurial > hg > mercurial-crew-with-dirclash
diff mercurial/dirstate.py @ 4677:de8ec7e1753a
dirstate.status: if a file is marked as copied, consider it modified
After a "hg copy --force --after somefile cleanfile", cleanfile
shouldn't be considered clean anymore.
| author | Alexis S. L. Carvalho <alexis@cecm.usp.br> |
|---|---|
| date | Thu, 21 Jun 2007 23:42:06 -0300 |
| parents | 27a386b96557 |
| children | a11921d24ec4 81078e177266 |
line wrap: on
line diff
--- a/mercurial/dirstate.py +++ b/mercurial/dirstate.py @@ -472,8 +472,9 @@ class dirstate(object): if type_ == 'n': if not st: st = os.lstat(self.wjoin(fn)) - if size >= 0 and (size != st.st_size - or (mode ^ st.st_mode) & 0100): + if (size >= 0 and (size != st.st_size + or (mode ^ st.st_mode) & 0100) + or fn in self._copymap): modified.append(fn) elif time != int(st.st_mtime): lookup.append(fn)