Mercurial > public > mercurial-scm > hg-stable
diff mercurial/filemerge.py @ 39159:5d3b58472660
filemerge: set actual capabilities of internal merge tools
This information is used to detect actual capabilities of internal
merge tools by subsequent patches.
For convenience, this patch assumes that merge tools typed as
"nomerge" have both binary files and symlinks capabilities.
| author | FUJIWARA Katsunori <foozy@lares.dti.ne.jp> |
|---|---|
| date | Tue, 14 Aug 2018 20:08:27 +0900 |
| parents | 0e58c5b20745 |
| children | 4d7b11877dd0 |
line wrap: on
line diff
--- a/mercurial/filemerge.py Tue Aug 14 20:05:36 2018 +0900 +++ b/mercurial/filemerge.py Tue Aug 14 20:08:27 2018 +0900 @@ -470,7 +470,7 @@ success, status = tagmerge.merge(repo, fcd, fco, fca) return success, status, False -@internaltool('dump', fullmerge) +@internaltool('dump', fullmerge, binary=True, symlink=True) def _idump(repo, mynode, orig, fcd, fco, fca, toolconf, files, labels=None): """ Creates three versions of the files to merge, containing the @@ -496,7 +496,7 @@ repo.wwrite(fd + ".base", fca.data(), fca.flags()) return False, 1, False -@internaltool('forcedump', mergeonly) +@internaltool('forcedump', mergeonly, binary=True, symlink=True) def _forcedump(repo, mynode, orig, fcd, fco, fca, toolconf, files, labels=None): """