On Fri, 17 Jul 2020 14:29:32 +0530, Pulkit Goyal wrote: > # HG changeset patch > # User Pulkit Goyal <7895pul...@gmail.com> > # Date 1594723868 -19800 > # Tue Jul 14 16:21:08 2020 +0530 > # Node ID 9fd8b89eee7e32ce4f3703d423cc320dec64da86 > # Parent 6a87141b0721d719fcc3b8bb94743eda1a120c17 > # EXP-Topic mergestate-refactor > merge: return 'commitinfo' from manifestmerge() and calculateupdates() (API) > > commitinfo will be used to pass information which is required on commit phase > from the merge phase. > > One common example is, merge chooses filenode from second parent and we need > to > tell commit to choose that. Right now this one and related cases are not very > neatly implement and there is no clear line on how to pass on such > information.
Is this commitinfo an orthogonal concept to the actions? If that's true, this change makes sense, but if not, I think commitinfo[f] == b'other' can be a third argument of ACTION_GET. Just asking because I didn't review the previous attempt. _______________________________________________ Mercurial-devel mailing list Mercurial-devel@mercurial-scm.org https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel
