[Commented On] D8596: merge: mark copies in in-memory context when merging

marmoute (Pierre-Yves David) phabricator at mercurial-scm.org
Wed Jun 10 18:03:35 UTC 2020


marmoute added inline comments.

INLINE COMMENTS

> martinvonz wrote in merge.py:1891
> It's defined on line 1631 and used a few times thereafter. Would you like a comment in each place it's used? I can add that in a separate patch. I don't know think there's a relevant docstring to update.

no, phabricator diffing made me think we were in the following function, that takes it as an argument:

  def applyupdates(
      repo, actions, wctx, mctx, overwrite, wantfiledata, labels=None
  ):

REPOSITORY
  rHG Mercurial

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

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

To: martinvonz, #hg-reviewers, marmoute
Cc: marmoute, durin42, mercurial-patches
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.mercurial-scm.org/pipermail/mercurial-patches/attachments/20200610/48a6d532/attachment-0002.html>


More information about the Mercurial-patches mailing list