phillco updated this revision to Diff 1509. REPOSITORY rHG Mercurial
CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D400?vs=1502&id=1509 REVISION DETAIL https://phab.mercurial-scm.org/D400 AFFECTED FILES mercurial/filemerge.py CHANGE DETAILS diff --git a/mercurial/filemerge.py b/mercurial/filemerge.py --- a/mercurial/filemerge.py +++ b/mercurial/filemerge.py @@ -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): To: phillco, #hg-reviewers Cc: mercurial-devel _______________________________________________ Mercurial-devel mailing list Mercurial-devel@mercurial-scm.org https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel