Mercurial > hg > mercurial-crew-with-dirclash
comparison 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 |
comparison
equal
deleted
inserted
replaced
| 4676:0f6e2b37512d | 4677:de8ec7e1753a |
|---|---|
| 470 continue | 470 continue |
| 471 # check the common case first | 471 # check the common case first |
| 472 if type_ == 'n': | 472 if type_ == 'n': |
| 473 if not st: | 473 if not st: |
| 474 st = os.lstat(self.wjoin(fn)) | 474 st = os.lstat(self.wjoin(fn)) |
| 475 if size >= 0 and (size != st.st_size | 475 if (size >= 0 and (size != st.st_size |
| 476 or (mode ^ st.st_mode) & 0100): | 476 or (mode ^ st.st_mode) & 0100) |
| 477 or fn in self._copymap): | |
| 477 modified.append(fn) | 478 modified.append(fn) |
| 478 elif time != int(st.st_mtime): | 479 elif time != int(st.st_mtime): |
| 479 lookup.append(fn) | 480 lookup.append(fn) |
| 480 elif list_clean: | 481 elif list_clean: |
| 481 clean.append(fn) | 482 clean.append(fn) |