D5410: merge: allow to merge non-conflicting changes outside narrowspec
pulkit (Pulkit Goyal)
phabricator at mercurial-scm.org
Mon Feb 4 08:48:06 EST 2019
pulkit added a comment.
In https://phab.mercurial-scm.org/D5410#80207, @martinvonz wrote:
> I'm pretty sure this doesn't actually perform the merge, it just drops the changes outside the narrowspec. On commit, we need to record that outside/ has the new nodeid that we got from the side we merged in. To do that, we need to remember what that nodeid is, from the time of `hg merge` to the time of `hg commit`. That probably means storing the nodeid in the dirstate (like git does), or maybe in the merge state.
IIUC, dirstate does not contains files outside narrowspec. Maybe we need to do this in merge state?
To: pulkit, durin42, #hg-reviewers, martinvonz
Cc: martinvonz, mercurial-devel
More information about the Mercurial-devel