D374: simplemerge: use contexts to read file data from, if passed

martinvonz (Martin von Zweigbergk) phabricator at mercurial-scm.org
Sat Aug 19 00:52:00 EDT 2017


martinvonz added inline comments.

INLINE COMMENTS

> simplemerge.py:425
> +    def readctx(ctx):
> +        if not ctx:
> +            return None

leftovers? doesn't seem to happen because you guard against it on lines 457-459

> simplemerge.py:430
> +                                         'using contexts')
> +        # `wwritedata` is used to get the post-filter data from `ctx` (i.e.,
> +        # what would have been in the working copy). Since merges were run in

What is this "post-filter data"? I didn't know hg had this feature. Something like git' clean/smudge filters?

REPOSITORY
  rHG Mercurial

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

To: phillco, #hg-reviewers
Cc: martinvonz, mercurial-devel


More information about the Mercurial-devel mailing list