mercurial/cext/__init__.py
author Pulkit Goyal <7895pulkit@gmail.com>
Tue, 14 Jul 2020 16:31:52 +0530
changeset 45276 cb6a72dc0511
parent 32211 c48583859e04
permissions -rw-r--r--
merge: pass commitinfo to applyupdates() and get it stored in mergestate This patch passes the commitinfo calulcated in manifestmerge() to applyupdates() so that it can be read there and stored in mergestate. On commit, we can read mergestate for such information and act accordingly. This patch also makes ACTION_GET_OTHER_AND_STORE not required anymore. Next patch will remove the messy code surrounding it. Differential Revision: https://phab.mercurial-scm.org/D8743
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines: