| hg-reviewers |
This way a future in-memory-merge context can intercept them.
| Lint Skipped |
| Unit Tests Skipped |
| labels.append('base') | labels.append('base') | ||||
| r = simplemerge.simplemerge(ui, fcd, fca, fco, | r = simplemerge.simplemerge(ui, fcd, fca, fco, | ||||
| quiet=True, label=labels, repo=repo) | quiet=True, label=labels, repo=repo) | ||||
| if not r: | if not r: | ||||
| ui.debug(" premerge successful\n") | ui.debug(" premerge successful\n") | ||||
| return 0 | return 0 | ||||
| if premerge not in validkeep: | if premerge not in validkeep: | ||||
| # restore from backup and try again | # restore from backup and try again | ||||
| util.copyfile(back, repo.wjoin(fcd.path())) | # TODO: Add a workingfilectx.write(otherfilectx) path so we can use | ||||
| # util.copy here instead. | |||||
| fcd.write(util.readfile(back), fcd.flags()) | |||||
| return 1 # continue merging | return 1 # continue merging | ||||
| def _mergecheck(repo, mynode, orig, fcd, fco, fca, toolconf): | def _mergecheck(repo, mynode, orig, fcd, fco, fca, toolconf): | ||||
| tool, toolpath, binary, symlink = toolconf | tool, toolpath, binary, symlink = toolconf | ||||
| if symlink: | if symlink: | ||||
| repo.ui.warn(_('warning: internal %s cannot merge symlinks ' | repo.ui.warn(_('warning: internal %s cannot merge symlinks ' | ||||
| 'for %s\n') % (tool, fcd.path())) | 'for %s\n') % (tool, fcd.path())) | ||||
| return False | return False | ||||