Mercurial > hg-stable
changeset 34310:575097b4dce0
largefiles: force an on-disk merge
Largefiles isn't a good candidate for in-memory merge (it uses a custom
dirstate, matcher, and the files might not fit in memory) so have it always
run an old-style merge.
Differential Revision: https://phab.mercurial-scm.org/D683
| author | Phil Cohen <phillco@fb.com> |
|---|---|
| date | Thu, 14 Sep 2017 13:14:32 -0700 |
| parents | 440ece43024c |
| children | ae510d9691ef |
| files | hgext/largefiles/overrides.py |
| diffstat | 1 files changed, 4 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/hgext/largefiles/overrides.py Thu Sep 14 13:14:32 2017 -0700 +++ b/hgext/largefiles/overrides.py Thu Sep 14 13:14:32 2017 -0700 @@ -1432,7 +1432,10 @@ lfdirstate.write() oldstandins = lfutil.getstandinsstate(repo) - + # Make sure the merge runs on disk, not in-memory. largefiles is not a + # good candidate for in-memory merge (large files, custom dirstate, + # matcher usage). + kwargs['wc'] = repo[None] result = orig(repo, node, branchmerge, force, *args, **kwargs) newstandins = lfutil.getstandinsstate(repo)