Mercurial > hg-stable
comparison tests/test-largefiles.t @ 23273:236c978bceca
largefiles: avoid redundant "updatelfiles" invocation in "overridetransplant"
At "hg transplant --merge REV", largefiles newly coming from the 2nd
parent (= REV) are marked as "a"(dded) by "patch.patch()", and have to
be marked as "n"(ormal) after commit.
But until changeset 3100d1cbce32, such largefiles were still marked as
"a" unexpectedly even after commit, because no additional entry is
added to filelog of such largefiles and they aren't listed in
"repo[newnode].files()" in this case: "newnode" is one of newly
committed changeset (= result of "repo.commit()").
"updatelfiles" invocation in "overridetransplant" shadows this problem
by forcibly synchronizing lfdirstate to dirstate.
Now, "updatelfiles" invocation in "overridetransplant" is redundant,
because changeset 3100d1cbce32 made "markcommitted" use "ctx.files()"
to get targets of "synclfdirstate" instead of "repo[newnode].files()".
author | FUJIWARA Katsunori <foozy@lares.dti.ne.jp> |
---|---|
date | Sat, 08 Nov 2014 00:48:38 +0900 |
parents | 51c9196a6bd0 |
children | bbe56e07e07a |
comparison
equal
deleted
inserted
replaced
23272:394c79df66c3 | 23273:236c978bceca |
---|---|
1738 searching for changes | 1738 searching for changes |
1739 adding changesets | 1739 adding changesets |
1740 adding manifests | 1740 adding manifests |
1741 adding file changes | 1741 adding file changes |
1742 added 1 changesets with 2 changes to 2 files | 1742 added 1 changesets with 2 changes to 2 files |
1743 getting changed largefiles | |
1744 0 largefiles updated, 0 removed | |
1745 $ hg log --template '{rev}:{node|short} {desc|firstline}\n' | 1743 $ hg log --template '{rev}:{node|short} {desc|firstline}\n' |
1746 9:598410d3eb9a modify normal file largefile in repo d | 1744 9:598410d3eb9a modify normal file largefile in repo d |
1747 8:a381d2c8c80e modify normal file and largefile in repo b | 1745 8:a381d2c8c80e modify normal file and largefile in repo b |
1748 7:daea875e9014 add/edit more largefiles | 1746 7:daea875e9014 add/edit more largefiles |
1749 6:4355d653f84f edit files yet again | 1747 6:4355d653f84f edit files yet again |