Show More
@@ -492,7 +492,7 b' class mergestate(object):' | |||||
492 | # restore local |
|
492 | # restore local | |
493 | if hash != nullhex: |
|
493 | if hash != nullhex: | |
494 | f = self._repo.vfs('merge/' + hash) |
|
494 | f = self._repo.vfs('merge/' + hash) | |
495 |
|
|
495 | wctx[dfile].write(f.read(), flags) | |
496 | f.close() |
|
496 | f.close() | |
497 | else: |
|
497 | else: | |
498 | wctx[dfile].remove(ignoremissing=True) |
|
498 | wctx[dfile].remove(ignoremissing=True) | |
@@ -1270,7 +1270,7 b' def applyupdates(repo, actions, wctx, mc' | |||||
1270 | f0, flags = args |
|
1270 | f0, flags = args | |
1271 | repo.ui.note(_("moving %s to %s\n") % (f0, f)) |
|
1271 | repo.ui.note(_("moving %s to %s\n") % (f0, f)) | |
1272 | audit(f) |
|
1272 | audit(f) | |
1273 |
|
|
1273 | wctx[f].write(wctx.filectx(f0).data(), flags) | |
1274 | wctx[f0].remove() |
|
1274 | wctx[f0].remove() | |
1275 | updated += 1 |
|
1275 | updated += 1 | |
1276 |
|
1276 | |||
@@ -1281,7 +1281,7 b' def applyupdates(repo, actions, wctx, mc' | |||||
1281 | progress(_updating, z, item=f, total=numupdates, unit=_files) |
|
1281 | progress(_updating, z, item=f, total=numupdates, unit=_files) | |
1282 | f0, flags = args |
|
1282 | f0, flags = args | |
1283 | repo.ui.note(_("getting %s to %s\n") % (f0, f)) |
|
1283 | repo.ui.note(_("getting %s to %s\n") % (f0, f)) | |
1284 |
|
|
1284 | wctx[f].write(mctx.filectx(f0).data(), flags) | |
1285 | updated += 1 |
|
1285 | updated += 1 | |
1286 |
|
1286 | |||
1287 | # exec |
|
1287 | # exec |
General Comments 0
You need to be logged in to leave comments.
Login now