phillco added inline comments.
INLINE COMMENTS
> martinvonz wrote in simplemerge.py:412
> Seems unfortunate to have both files and contexts. This is what you mentioned
> today you will replace by use of "arbitraryfilectx"?
They get taken out in https://phab.mercurial-scm.org/D381; they have to
martinvonz added inline comments.
INLINE COMMENTS
> simplemerge.py:412
> +def simplemerge(ui, localfile, basefile, otherfile,
> +localctx=None, basectx=None, otherctx=None, repo=None,
> **opts):
> def readfile(filename):
Seems unfortunate to have both files and contexts. Th
This revision was automatically updated to reflect the committed changes.
Closed by commit rHGb3571dc0e6b8: simplemerge: add optional context parameters
to simplemerge (authored by phillco).
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D372?vs=853&id=954
phillco created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.
REVISION SUMMARY
Rename the existing parameters for clarity.
These will, in subsequent patches, allow callers to redirect reads (of the
three sides of the merge) and writes (o
