[Commented On] D8923: mergestate: replace `addmergedother()` with generic `addcommitinfo()` (API)

pulkit (Pulkit Goyal) phabricator at mercurial-scm.org
Tue Aug 11 07:49:45 UTC 2020


pulkit added a comment.


  In D8923#133565 <https://phab.mercurial-scm.org/D8923#133565>, @marmoute wrote:
  
  > This seems to conflict with my request for D8921 <https://phab.mercurial-scm.org/D8921>, do we have a good way forward that allow to still rename the key ?
  
  Updated the previous patches and renamed the key. My further plan is to start storing filenodes in `_stateextras` of mergestate. However we will need to keep the current `{b'filenode-source': b'other'}` trick in place because old versions don't store the filenode.

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST ACTION
  https://phab.mercurial-scm.org/D8923/new/

REVISION DETAIL
  https://phab.mercurial-scm.org/D8923

To: pulkit, #hg-reviewers, marmoute
Cc: marmoute, mercurial-patches
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.mercurial-scm.org/pipermail/mercurial-patches/attachments/20200811/31b85c8d/attachment-0002.html>


More information about the Mercurial-patches mailing list