Show More
@@ -601,8 +601,7 b' def synclfdirstate(repo, lfdirstate, lfi' | |||||
601 | def markcommitted(orig, ctx, node): |
|
601 | def markcommitted(orig, ctx, node): | |
602 | repo = ctx.repo() |
|
602 | repo = ctx.repo() | |
603 |
|
603 | |||
604 | lfdirstate = openlfdirstate(repo.ui, repo) |
|
604 | with repo.dirstate.changing_parents(repo): | |
605 | with lfdirstate.changing_parents(repo): |
|
|||
606 | orig(node) |
|
605 | orig(node) | |
607 |
|
606 | |||
608 | # ATTENTION: "ctx.files()" may differ from "repo[node].files()" |
|
607 | # ATTENTION: "ctx.files()" may differ from "repo[node].files()" | |
@@ -614,11 +613,11 b' def markcommitted(orig, ctx, node):' | |||||
614 | # - have to be marked as "n" after commit, but |
|
613 | # - have to be marked as "n" after commit, but | |
615 | # - aren't listed in "repo[node].files()" |
|
614 | # - aren't listed in "repo[node].files()" | |
616 |
|
615 | |||
|
616 | lfdirstate = openlfdirstate(repo.ui, repo) | |||
617 | for f in ctx.files(): |
|
617 | for f in ctx.files(): | |
618 | lfile = splitstandin(f) |
|
618 | lfile = splitstandin(f) | |
619 | if lfile is not None: |
|
619 | if lfile is not None: | |
620 | synclfdirstate(repo, lfdirstate, lfile, False) |
|
620 | synclfdirstate(repo, lfdirstate, lfile, False) | |
621 | lfdirstate.write(repo.currenttransaction()) |
|
|||
622 |
|
621 | |||
623 | # As part of committing, copy all of the largefiles into the cache. |
|
622 | # As part of committing, copy all of the largefiles into the cache. | |
624 | # |
|
623 | # |
General Comments 0
You need to be logged in to leave comments.
Login now