Mercurial > hg
diff mercurial/sparse.py @ 47709:a0e79084389d
sparse: use `update_file` instead of `normal` during `applyupdates`
This is the newer, more semantic API.
(more content end up "nonnormal", see previous commit)
Differential Revision: https://phab.mercurial-scm.org/D11151
author | Pierre-Yves David <pierre-yves.david@octobus.net> |
---|---|
date | Mon, 19 Jul 2021 01:58:24 +0200 |
parents | 7bdfd88251c0 |
children | 3148204e649e |
line wrap: on
line diff
--- a/mercurial/sparse.py Mon Jul 19 04:26:06 2021 +0200 +++ b/mercurial/sparse.py Mon Jul 19 01:58:24 2021 +0200 @@ -453,7 +453,7 @@ for file, flags, msg in tmresult.getactions( [mergestatemod.ACTION_GET] ): - dirstate.normal(file) + dirstate.update_file(file, p1_tracked=True, wc_tracked=True) profiles = activeconfig(repo)[2] changedprofiles = profiles & files