Show More
@@ -395,10 +395,15 b' class mergestate(object):' | |||||
395 | return complete, r |
|
395 | return complete, r | |
396 |
|
396 | |||
397 | def preresolve(self, dfile, wctx, labels=None): |
|
397 | def preresolve(self, dfile, wctx, labels=None): | |
|
398 | """run premerge process for dfile | |||
|
399 | ||||
|
400 | Returns whether the merge is complete, and the exit code.""" | |||
398 | return self._resolve(True, dfile, wctx, labels=labels) |
|
401 | return self._resolve(True, dfile, wctx, labels=labels) | |
399 |
|
402 | |||
400 | def resolve(self, dfile, wctx, labels=None): |
|
403 | def resolve(self, dfile, wctx, labels=None): | |
401 |
"""r |
|
404 | """run merge process (assuming premerge was run) for dfile | |
|
405 | ||||
|
406 | Returns the exit code of the merge.""" | |||
402 | return self._resolve(False, dfile, wctx, labels=labels)[1] |
|
407 | return self._resolve(False, dfile, wctx, labels=labels)[1] | |
403 |
|
408 | |||
404 | def _checkunknownfile(repo, wctx, mctx, f, f2=None): |
|
409 | def _checkunknownfile(repo, wctx, mctx, f, f2=None): |
General Comments 0
You need to be logged in to leave comments.
Login now