Submitter | phabricator |
---|---|
Date | Aug. 25, 2017, 9:01 p.m. |
Message ID | <98ebd8f364e3ee424fdbeb8e3a3d120f@localhost.localdomain> |
Download | mbox | patch |
Permalink | /patch/23353/ |
State | Not Applicable |
Headers | show |
Comments
Patch
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):