Show More
@@ -1896,6 +1896,9 b' class workingfilectx(committablefilectx)' | |||||
1896 | """wraps repo.wwrite""" |
|
1896 | """wraps repo.wwrite""" | |
1897 | self._repo.wwrite(self._path, data, flags) |
|
1897 | self._repo.wwrite(self._path, data, flags) | |
1898 |
|
1898 | |||
|
1899 | def setflags(self, l, x): | |||
|
1900 | self._repo.wvfs.setflags(self._path, l, x) | |||
|
1901 | ||||
1899 | class workingcommitctx(workingctx): |
|
1902 | class workingcommitctx(workingctx): | |
1900 | """A workingcommitctx object makes access to data related to |
|
1903 | """A workingcommitctx object makes access to data related to | |
1901 | the revision being committed convenient. |
|
1904 | the revision being committed convenient. |
@@ -1291,7 +1291,7 b' def applyupdates(repo, actions, wctx, mc' | |||||
1291 | progress(_updating, z, item=f, total=numupdates, unit=_files) |
|
1291 | progress(_updating, z, item=f, total=numupdates, unit=_files) | |
1292 | flags, = args |
|
1292 | flags, = args | |
1293 | audit(f) |
|
1293 | audit(f) | |
1294 |
|
|
1294 | wctx[f].setflags('l' in flags, 'x' in flags) | |
1295 | updated += 1 |
|
1295 | updated += 1 | |
1296 |
|
1296 | |||
1297 | # the ordering is important here -- ms.mergedriver will raise if the merge |
|
1297 | # the ordering is important here -- ms.mergedriver will raise if the merge |
General Comments 0
You need to be logged in to leave comments.
Login now