Show More
@@ -920,7 +920,7 b' def overriderevert(orig, ui, repo, ctx, ' | |||||
920 | # Because we put the standins in a bad state (by updating them) |
|
920 | # Because we put the standins in a bad state (by updating them) | |
921 | # and then return them to a correct state we need to lock to |
|
921 | # and then return them to a correct state we need to lock to | |
922 | # prevent others from changing them in their incorrect state. |
|
922 | # prevent others from changing them in their incorrect state. | |
923 | with repo.wlock(): |
|
923 | with repo.wlock(), repo.dirstate.running_status(repo): | |
924 | lfdirstate = lfutil.openlfdirstate(ui, repo) |
|
924 | lfdirstate = lfutil.openlfdirstate(ui, repo) | |
925 | s = lfutil.lfdirstatestatus(lfdirstate, repo) |
|
925 | s = lfutil.lfdirstatestatus(lfdirstate, repo) | |
926 | lfdirstate.write(repo.currenttransaction()) |
|
926 | lfdirstate.write(repo.currenttransaction()) |
General Comments 0
You need to be logged in to leave comments.
Login now