Mercurial > public > mercurial-scm > hg

comparison mercurial/filemerge.py @ 34785:1af4561b6bfe

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
filemerge: add a missing flushall() Differential Revision: https://phab.mercurial-scm.org/D1060
author Phil Cohen <phillco@fb.com>
date Sun, 15 Oct 2017 20:36:29 -0700
parents 123a68e6b473
children ed91846c29cf
comparison
equal deleted inserted replaced
34784:123a68e6b473 34785:1af4561b6bfe
465 runs successfully. Use :forcedump to forcibly write files out. 465 runs successfully. Use :forcedump to forcibly write files out.
466 """ 466 """
467 a = _workingpath(repo, fcd) 467 a = _workingpath(repo, fcd)
468 fd = fcd.path() 468 fd = fcd.path()
469 469
470 # Run ``flushall()`` to make any missing folders the following wwrite
471 # calls might be depending on.
472 from . import context
473 if isinstance(fcd, context.overlayworkingfilectx):
474 fcd.ctx().flushall()
475
470 util.writefile(a + ".local", fcd.decodeddata()) 476 util.writefile(a + ".local", fcd.decodeddata())
471 repo.wwrite(fd + ".other", fco.data(), fco.flags()) 477 repo.wwrite(fd + ".other", fco.data(), fco.flags())
472 repo.wwrite(fd + ".base", fca.data(), fca.flags()) 478 repo.wwrite(fd + ".base", fca.data(), fca.flags())
473 return False, 1, False 479 return False, 1, False
474 480