Mercurial > hg-stable
changeset 26870:ab798d1a230f
merge.mergestate: update docstrings for preresolve and resolve
Add a docstring for preresolve, and update the one for resolve.
| author | Siddharth Agarwal <sid0@fb.com> |
|---|---|
| date | Wed, 04 Nov 2015 23:44:51 -0800 |
| parents | 412e8c5e38b4 |
| children | 1cbf144fd8a1 |
| files | mercurial/merge.py |
| diffstat | 1 files changed, 6 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial/merge.py Mon Oct 26 02:35:48 2015 -0700 +++ b/mercurial/merge.py Wed Nov 04 23:44:51 2015 -0800 @@ -395,10 +395,15 @@ return complete, r def preresolve(self, dfile, wctx, labels=None): + """run premerge process for dfile + + Returns whether the merge is complete, and the exit code.""" return self._resolve(True, dfile, wctx, labels=labels) def resolve(self, dfile, wctx, labels=None): - """rerun merge process for file path `dfile`""" + """run merge process (assuming premerge was run) for dfile + + Returns the exit code of the merge.""" return self._resolve(False, dfile, wctx, labels=labels)[1] def _checkunknownfile(repo, wctx, mctx, f, f2=None):