Show More
@@ -574,7 +574,8 b' def synclfdirstate(repo, lfdirstate, lfi' | |||||
574 | def markcommitted(orig, ctx, node): |
|
574 | def markcommitted(orig, ctx, node): | |
575 | repo = ctx.repo() |
|
575 | repo = ctx.repo() | |
576 |
|
576 | |||
577 | with ctx._repo.dirstate.parentchange(): |
|
577 | lfdirstate = openlfdirstate(repo.ui, repo) | |
|
578 | with lfdirstate.parentchange(): | |||
578 | orig(node) |
|
579 | orig(node) | |
579 |
|
580 | |||
580 | # ATTENTION: "ctx.files()" may differ from "repo[node].files()" |
|
581 | # ATTENTION: "ctx.files()" may differ from "repo[node].files()" | |
@@ -586,7 +587,6 b' def markcommitted(orig, ctx, node):' | |||||
586 | # - have to be marked as "n" after commit, but |
|
587 | # - have to be marked as "n" after commit, but | |
587 | # - aren't listed in "repo[node].files()" |
|
588 | # - aren't listed in "repo[node].files()" | |
588 |
|
589 | |||
589 | lfdirstate = openlfdirstate(repo.ui, repo) |
|
|||
590 | for f in ctx.files(): |
|
590 | for f in ctx.files(): | |
591 | lfile = splitstandin(f) |
|
591 | lfile = splitstandin(f) | |
592 | if lfile is not None: |
|
592 | if lfile is not None: |
General Comments 0
You need to be logged in to leave comments.
Login now