Mercurial > hg
comparison tests/test-help.t @ 39268:0dfcc348d383
help: revise explanation about capability check while selecting merge tool
This is follow up of 7c6044634957 and cded904f7acc.
This patch adds explanations about:
- notation in capability columns in the table
- how capabilities of external merge tools are treated
| author | FUJIWARA Katsunori <foozy@lares.dti.ne.jp> |
|---|---|
| date | Wed, 22 Aug 2018 14:22:59 +0900 |
| parents | d7ac6dafc609 |
| children | 828a45233036 |
comparison
equal
deleted
inserted
replaced
| 39267:88c5a3ef54b1 | 39268:0dfcc348d383 |
|---|---|
| 1916 but it will by default not be used for symlinks and binary files. | 1916 but it will by default not be used for symlinks and binary files. |
| 1917 7. If the file to be merged is not binary and is not a symlink, then | 1917 7. If the file to be merged is not binary and is not a symlink, then |
| 1918 internal ":merge" is used. | 1918 internal ":merge" is used. |
| 1919 8. Otherwise, ":prompt" is used. | 1919 8. Otherwise, ":prompt" is used. |
| 1920 | 1920 |
| 1921 For historical reason, Mercurial assumes capabilities of internal merge | 1921 For historical reason, Mercurial treats merge tools as below while |
| 1922 tools as below while examining rules above, regardless of actual | 1922 examining rules above. |
| 1923 capabilities of them. | |
| 1924 | 1923 |
| 1925 step specified via binary symlink | 1924 step specified via binary symlink |
| 1926 ---------------------------------- | 1925 ---------------------------------- |
| 1927 1. --tool o o | 1926 1. --tool o/o o/o |
| 1928 2. HGMERGE o o | 1927 2. HGMERGE o/o o/o |
| 1929 3. merge-patterns o (*) x (*) | 1928 3. merge-patterns o/o(*) x/?(*) |
| 1930 4. ui.merge x (*) x (*) | 1929 4. ui.merge x/?(*) x/?(*) |
| 1930 | |
| 1931 Each capability column indicates Mercurial behavior for internal/external | |
| 1932 merge tools at examining each rule. | |
| 1933 | |
| 1934 - "o": "assume that a tool has capability" | |
| 1935 - "x": "assume that a tool does not have capability" | |
| 1936 - "?": "check actual capability of a tool" | |
| 1931 | 1937 |
| 1932 If "merge.strict-capability-check" configuration is true, Mercurial checks | 1938 If "merge.strict-capability-check" configuration is true, Mercurial checks |
| 1933 capabilities of internal merge tools strictly in (*) cases above. It is | 1939 capabilities of merge tools strictly in (*) cases above (= each capability |
| 1934 false by default for backward compatibility. | 1940 column becomes "?/?"). It is false by default for backward compatibility. |
| 1935 | 1941 |
| 1936 Note: | 1942 Note: |
| 1937 After selecting a merge program, Mercurial will by default attempt to | 1943 After selecting a merge program, Mercurial will by default attempt to |
| 1938 merge the files using a simple merge algorithm first. Only if it | 1944 merge the files using a simple merge algorithm first. Only if it |
| 1939 doesn't succeed because of conflicting changes will Mercurial actually | 1945 doesn't succeed because of conflicting changes will Mercurial actually |