Mercurial > public > mercurial-scm > hg

comparison mercurial/mergestate.py @ 47691:33beeb32f73a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
dirstate: replace `update_parent_file_data` with simpler `update_parent` call This make the dirstate API simpler. Differential Revision: https://phab.mercurial-scm.org/D11133
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Fri, 16 Jul 2021 22:30:11 +0200
parents 8b16ccc71001
children 8e2e8d0a9a56
comparison
equal deleted inserted replaced
47690:a685c29ebf54 47691:33beeb32f73a
799 wc_tracked=True, 799 wc_tracked=True,
800 clean_p2=True, 800 clean_p2=True,
801 ) 801 )
802 else: 802 else:
803 parentfiledata = getfiledata[f] if getfiledata else None 803 parentfiledata = getfiledata[f] if getfiledata else None
804 repo.dirstate.update_parent_file_data(f, parentfiledata) 804 repo.dirstate.update_file(
805 f,
806 p1_tracked=True,
807 wc_tracked=True,
808 parentfiledata=parentfiledata,
809 )
805 810
806 # merge 811 # merge
807 for f, args, msg in actions.get(ACTION_MERGE, []): 812 for f, args, msg in actions.get(ACTION_MERGE, []):
808 f1, f2, fa, move, anc = args 813 f1, f2, fa, move, anc = args
809 if branchmerge: 814 if branchmerge: