Mercurial > hg

diff hgext/convert/hg.py @ 45275:8e8d513941b4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge: introduce 'commitinfo' in mergeresult 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. Upcoming patches will try to work on in this area and make things easier. Differential Revision: https://phab.mercurial-scm.org/D8742
author Pulkit Goyal <7895pulkit@gmail.com>
date Tue, 14 Jul 2020 16:21:08 +0530
parents 0e18861f96ab
children 3c783ff08d40
line wrap: on
line diff
--- a/hgext/convert/hg.py	Thu Jul 23 18:03:14 2020 +0530
+++ b/hgext/convert/hg.py	Tue Jul 14 16:21:08 2020 +0530
@@ -217,6 +217,7 @@
         """
         anc = [p1ctx.ancestor(p2ctx)]
         # Calculate what files are coming from p2
+        # TODO: mresult.commitinfo might be able to get that info
         mresult = mergemod.calculateupdates(
             self.repo,
             p1ctx,