Show More
@@ -313,10 +313,10 b' class _mergestate_base(object):' | |||||
313 | """return extras stored with the mergestate for the given filename""" |
|
313 | """return extras stored with the mergestate for the given filename""" | |
314 | return self._stateextras[filename] |
|
314 | return self._stateextras[filename] | |
315 |
|
315 | |||
316 |
def |
|
316 | def resolve(self, dfile, wctx): | |
317 |
"""r |
|
317 | """run merge process for dfile | |
318 | Returns the return value of merge obtained from filemerge._filemerge(). |
|
318 | ||
319 | """ |
|
319 | Returns the exit code of the merge.""" | |
320 | if self[dfile] in ( |
|
320 | if self[dfile] in ( | |
321 | MERGE_RECORD_RESOLVED, |
|
321 | MERGE_RECORD_RESOLVED, | |
322 | LEGACY_RECORD_DRIVER_RESOLVED, |
|
322 | LEGACY_RECORD_DRIVER_RESOLVED, | |
@@ -405,12 +405,6 b' class _mergestate_base(object):' | |||||
405 |
|
405 | |||
406 | return merge_ret |
|
406 | return merge_ret | |
407 |
|
407 | |||
408 | def resolve(self, dfile, wctx): |
|
|||
409 | """run merge process for dfile |
|
|||
410 |
|
||||
411 | Returns the exit code of the merge.""" |
|
|||
412 | return self._resolve(dfile, wctx) |
|
|||
413 |
|
||||
414 | def counts(self): |
|
408 | def counts(self): | |
415 | """return counts for updated, merged and removed files in this |
|
409 | """return counts for updated, merged and removed files in this | |
416 | session""" |
|
410 | session""" |
General Comments 0
You need to be logged in to leave comments.
Login now