[Commented On] D8504: diff: add experimental support for "merge diffs"

Tue May 12 02:57:41 UTC 2020

martinvonz added inline comments.

INLINE COMMENTS

> commands.py:2501
> +        if diffmerge and ctx2.p2().node() != nullid:
> +            mctx = ctx2
> +            ctx1 = mctx.p1()

How about calling these "pctx1" and "pctx2" instead so the same name doesn't change meaning and so you don't have to reassign "ctx2"?

> durin42 wrote in test-diff-change.t:187
> Not sure what you mean. Can you elaborate?

Like the test case you added below. There, base is "8", left is "z", right is "y", and resolved is "z", if I'm reading that right.

REPOSITORY
  rHG Mercurial

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

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

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