Show More
@@ -3068,7 +3068,7 b' def _performrevert(repo, parents, ctx, a' | |||||
3068 | node = ctx.node() |
|
3068 | node = ctx.node() | |
3069 | def checkout(f): |
|
3069 | def checkout(f): | |
3070 | fc = ctx[f] |
|
3070 | fc = ctx[f] | |
3071 |
|
|
3071 | repo.wwrite(f, fc.data(), fc.flags()) | |
3072 |
|
3072 | |||
3073 | audit_path = pathutil.pathauditor(repo.root) |
|
3073 | audit_path = pathutil.pathauditor(repo.root) | |
3074 | for f in actions['forget'][0]: |
|
3074 | for f in actions['forget'][0]: | |
@@ -3135,13 +3135,9 b' def _performrevert(repo, parents, ctx, a' | |||||
3135 | del fp |
|
3135 | del fp | |
3136 | else: |
|
3136 | else: | |
3137 | for f in actions['revert'][0]: |
|
3137 | for f in actions['revert'][0]: | |
3138 |
|
|
3138 | checkout(f) | |
3139 | if normal: |
|
3139 | if normal: | |
3140 | normal(f) |
|
3140 | normal(f) | |
3141 | elif wsize == repo.dirstate._map[f][2]: |
|
|||
3142 | # changes may be overlooked without normallookup, |
|
|||
3143 | # if size isn't changed at reverting |
|
|||
3144 | repo.dirstate.normallookup(f) |
|
|||
3145 |
|
3141 | |||
3146 | for f in actions['add'][0]: |
|
3142 | for f in actions['add'][0]: | |
3147 | # Don't checkout modified files, they are already created by the diff |
|
3143 | # Don't checkout modified files, they are already created by the diff |
General Comments 0
You need to be logged in to leave comments.
Login now