Mercurial > public > mercurial-scm > hg

comparison mercurial/filemerge.py @ 26573:a875773cf537

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
filemerge._idump: drop no longer necessary 'if r:' check Cleanup from an earlier patch to make premerge be directly called from the main filemerge function.
author Siddharth Agarwal <sid0@fb.com>
date Thu, 08 Oct 2015 14:17:31 -0700
parents c7850af6bb75
children f82cb7dffb49
comparison
equal deleted inserted replaced
26572:c7850af6bb75 26573:a875773cf537
344 contents of local, other and base. These files can then be used to 344 contents of local, other and base. These files can then be used to
345 perform a merge manually. If the file to be merged is named 345 perform a merge manually. If the file to be merged is named
346 ``a.txt``, these files will accordingly be named ``a.txt.local``, 346 ``a.txt``, these files will accordingly be named ``a.txt.local``,
347 ``a.txt.other`` and ``a.txt.base`` and they will be placed in the 347 ``a.txt.other`` and ``a.txt.base`` and they will be placed in the
348 same directory as ``a.txt``.""" 348 same directory as ``a.txt``."""
349 r = 1 349 a, b, c, back = files
350 if r: 350
351 a, b, c, back = files 351 fd = fcd.path()
352 352
353 fd = fcd.path() 353 util.copyfile(a, a + ".local")
354 354 repo.wwrite(fd + ".other", fco.data(), fco.flags())
355 util.copyfile(a, a + ".local") 355 repo.wwrite(fd + ".base", fca.data(), fca.flags())
356 repo.wwrite(fd + ".other", fco.data(), fco.flags()) 356 return False, 1
357 repo.wwrite(fd + ".base", fca.data(), fca.flags())
358 return False, r
359 357
360 def _xmerge(repo, mynode, orig, fcd, fco, fca, toolconf, files, labels=None): 358 def _xmerge(repo, mynode, orig, fcd, fco, fca, toolconf, files, labels=None):
361 r = 1 359 r = 1
362 if r: 360 if r:
363 tool, toolpath, binary, symlink = toolconf 361 tool, toolpath, binary, symlink = toolconf