equal
deleted
inserted
replaced
466 runs successfully. Use :forcedump to forcibly write files out. |
466 runs successfully. Use :forcedump to forcibly write files out. |
467 """ |
467 """ |
468 a = _workingpath(repo, fcd) |
468 a = _workingpath(repo, fcd) |
469 fd = fcd.path() |
469 fd = fcd.path() |
470 |
470 |
471 util.copyfile(a, a + ".local") |
471 util.writefile(a + ".local", fcd.decodeddata()) |
472 repo.wwrite(fd + ".other", fco.data(), fco.flags()) |
472 repo.wwrite(fd + ".other", fco.data(), fco.flags()) |
473 repo.wwrite(fd + ".base", fca.data(), fca.flags()) |
473 repo.wwrite(fd + ".base", fca.data(), fca.flags()) |
474 return False, 1, False |
474 return False, 1, False |
475 |
475 |
476 @internaltool('forcedump', mergeonly) |
476 @internaltool('forcedump', mergeonly) |