Show More
@@ -1879,6 +1879,12 b' class workingfilectx(committablefilectx)' | |||||
1879 | raise |
|
1879 | raise | |
1880 | return (t, tz) |
|
1880 | return (t, tz) | |
1881 |
|
1881 | |||
|
1882 | def exists(self): | |||
|
1883 | return self._repo.wvfs.exists(self._path) | |||
|
1884 | ||||
|
1885 | def lexists(self): | |||
|
1886 | return self._repo.wvfs.lexists(self._path) | |||
|
1887 | ||||
1882 | def audit(self): |
|
1888 | def audit(self): | |
1883 | return self._repo.wvfs.audit(self._path) |
|
1889 | return self._repo.wvfs.audit(self._path) | |
1884 |
|
1890 |
@@ -9,7 +9,6 b' from __future__ import absolute_import' | |||||
9 |
|
9 | |||
10 | import errno |
|
10 | import errno | |
11 | import hashlib |
|
11 | import hashlib | |
12 | import os |
|
|||
13 | import shutil |
|
12 | import shutil | |
14 | import struct |
|
13 | import struct | |
15 |
|
14 | |||
@@ -1206,7 +1205,7 b' def applyupdates(repo, actions, wctx, mc' | |||||
1206 |
|
1205 | |||
1207 | # remove renamed files after safely stored |
|
1206 | # remove renamed files after safely stored | |
1208 | for f in moves: |
|
1207 | for f in moves: | |
1209 |
if |
|
1208 | if wctx[f].lexists(): | |
1210 | repo.ui.debug("removing %s\n" % f) |
|
1209 | repo.ui.debug("removing %s\n" % f) | |
1211 | wctx[f].audit() |
|
1210 | wctx[f].audit() | |
1212 | wctx[f].remove() |
|
1211 | wctx[f].remove() |
General Comments 0
You need to be logged in to leave comments.
Login now