Show More
@@ -392,6 +392,15 b' def markcommitted(orig, ctx, node):' | |||
|
392 | 392 | |
|
393 | 393 | orig(node) |
|
394 | 394 | |
|
395 | # ATTENTION: "ctx.files()" may differ from "repo[node].files()" | |
|
396 | # because files coming from the 2nd parent are omitted in the latter. | |
|
397 | # | |
|
398 | # The former should be used to get targets of "synclfdirstate", | |
|
399 | # because such files: | |
|
400 | # - are marked as "a" by "patch.patch()" (e.g. via transplant), and | |
|
401 | # - have to be marked as "n" after commit, but | |
|
402 | # - aren't listed in "repo[node].files()" | |
|
403 | ||
|
395 | 404 | lfdirstate = openlfdirstate(repo.ui, repo) |
|
396 | 405 | for f in ctx.files(): |
|
397 | 406 | if isstandin(f): |
@@ -1169,13 +1169,8 b' def overriderollback(orig, ui, repo, **o' | |||
|
1169 | 1169 | |
|
1170 | 1170 | def overridetransplant(orig, ui, repo, *revs, **opts): |
|
1171 | 1171 | try: |
|
1172 | oldstandins = lfutil.getstandinsstate(repo) | |
|
1173 | 1172 | repo._istransplanting = True |
|
1174 | 1173 | result = orig(ui, repo, *revs, **opts) |
|
1175 | newstandins = lfutil.getstandinsstate(repo) | |
|
1176 | filelist = lfutil.getlfilestoupdate(oldstandins, newstandins) | |
|
1177 | lfcommands.updatelfiles(repo.ui, repo, filelist=filelist, | |
|
1178 | printmessage=True) | |
|
1179 | 1174 | finally: |
|
1180 | 1175 | repo._istransplanting = False |
|
1181 | 1176 | return result |
@@ -1740,8 +1740,6 b' Test that transplanting a largefile chan' | |||
|
1740 | 1740 | adding manifests |
|
1741 | 1741 | adding file changes |
|
1742 | 1742 | added 1 changesets with 2 changes to 2 files |
|
1743 | getting changed largefiles | |
|
1744 | 0 largefiles updated, 0 removed | |
|
1745 | 1743 | $ hg log --template '{rev}:{node|short} {desc|firstline}\n' |
|
1746 | 1744 | 9:598410d3eb9a modify normal file largefile in repo d |
|
1747 | 1745 | 8:a381d2c8c80e modify normal file and largefile in repo b |
General Comments 0
You need to be logged in to leave comments.
Login now