equal
deleted
inserted
replaced
1895 # already changed simultaneously after last |
1895 # already changed simultaneously after last |
1896 # caching (see also issue5584 for detail) |
1896 # caching (see also issue5584 for detail) |
1897 self._repo.ui.debug( |
1897 self._repo.ui.debug( |
1898 b'skip updating dirstate: identity mismatch\n' |
1898 b'skip updating dirstate: identity mismatch\n' |
1899 ) |
1899 ) |
|
1900 # throw away anything we have. |
|
1901 dirstate.invalidate() |
1900 except error.LockError: |
1902 except error.LockError: |
1901 pass |
1903 pass |
1902 finally: |
1904 finally: |
1903 # Even if the wlock couldn't be grabbed, clear out the list. |
1905 # Even if the wlock couldn't be grabbed, clear out the list. |
1904 self._repo.clearpostdsstatus() |
1906 self._repo.clearpostdsstatus() |