Mercurial > public > mercurial-scm > hg-stable
diff mercurial/merge.py @ 34137:c0ce60459d84
merge: pass wctx to premerge, filemerge
In the in-memory merge branch. we'll need to call a function (``flushall``) on
the wctx inside of _xmerge.
This prepares the way so it can be done without hacks like ``fcd.ctx()``.
Differential Revision: https://phab.mercurial-scm.org/D449
| author | Phil Cohen <phillco@fb.com> |
|---|---|
| date | Mon, 11 Sep 2017 13:03:27 -0700 |
| parents | 65ae54582713 |
| children | b90e5b2a9c82 |
line wrap: on
line diff
--- a/mercurial/merge.py Mon Sep 11 18:07:29 2017 +0200 +++ b/mercurial/merge.py Mon Sep 11 13:03:27 2017 -0700 @@ -495,12 +495,14 @@ f.close() else: wctx[dfile].remove(ignoremissing=True) - complete, r, deleted = filemerge.premerge(self._repo, self._local, - lfile, fcd, fco, fca, + complete, r, deleted = filemerge.premerge(self._repo, wctx, + self._local, lfile, fcd, + fco, fca, labels=self._labels) else: - complete, r, deleted = filemerge.filemerge(self._repo, self._local, - lfile, fcd, fco, fca, + complete, r, deleted = filemerge.filemerge(self._repo, wctx, + self._local, lfile, fcd, + fco, fca, labels=self._labels) if r is None: # no real conflict