445 repo.wwrite(fd + ".base", fca.data(), fca.flags()) |
445 repo.wwrite(fd + ".base", fca.data(), fca.flags()) |
446 return False, 1, False |
446 return False, 1, False |
447 |
447 |
448 def _xmerge(repo, mynode, orig, fcd, fco, fca, toolconf, files, labels=None): |
448 def _xmerge(repo, mynode, orig, fcd, fco, fca, toolconf, files, labels=None): |
449 tool, toolpath, binary, symlink = toolconf |
449 tool, toolpath, binary, symlink = toolconf |
|
450 if fcd.isabsent() or fco.isabsent(): |
|
451 repo.ui.warn(_('warning: %s cannot merge change/delete conflict ' |
|
452 'for %s\n') % (tool, fcd.path())) |
|
453 return False, 1, None |
450 a, b, c, back = files |
454 a, b, c, back = files |
451 out = "" |
455 out = "" |
452 env = {'HG_FILE': fcd.path(), |
456 env = {'HG_FILE': fcd.path(), |
453 'HG_MY_NODE': short(mynode), |
457 'HG_MY_NODE': short(mynode), |
454 'HG_OTHER_NODE': str(fco.changectx()), |
458 'HG_OTHER_NODE': str(fco.changectx()), |