Mercurial > hg
changeset 34033:d37f1bb68169
filemerge: move a util copy call to filectx.write
This way a future in-memory-merge context can intercept them.
Differential Revision: https://phab.mercurial-scm.org/D400
| author | Phil Cohen <phillco@fb.com> |
|---|---|
| date | Thu, 31 Aug 2017 11:28:59 -0700 |
| parents | 67cfffbfb6a0 |
| children | 7558917f291e |
| files | mercurial/filemerge.py |
| diffstat | 1 files changed, 3 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial/filemerge.py Thu Aug 31 11:28:59 2017 -0700 +++ b/mercurial/filemerge.py Thu Aug 31 11:28:59 2017 -0700 @@ -348,7 +348,9 @@ return 0 if premerge not in validkeep: # 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 def _mergecheck(repo, mynode, orig, fcd, fco, fca, toolconf):