Mercurial Mercurial > hg-stable / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
sparse: use `update_file` instead of `normal` during `applyupdates`
authorPierre-Yves David <pierre-yves.david@octobus.net>
Mon, 19 Jul 2021 01:58:24 +0200
changeset 47709 a0e79084389d
parent 47708 7bdfd88251c0
child 47710 3148204e649e
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
mercurial/sparse.py file | annotate | diff | comparison | revisions 
--- 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
hg-stable