Mercurial > hg
comparison mercurial/configitems.py @ 38793:6c8e3c847977
resolve: add option to warn/abort on -m with unresolved conflict markers
When a user is dropped out of Mercurial to a terminal to resolve files, we emit
messages like:
conflicts while merging file1! (edit, then use 'hg resolve --mark')
conflicts while merging file2! (edit, then use 'hg resolve --mark')
We don't mention a file name in the hint, so some users might do something like
`$EDITOR file1; hg resolve --mark`, see that it says "(no more unresolved
files)" and forget to deal with file2 before running the next command.
Even if we did mention a file name in the hint, it's too easy to forget it
(maybe the merge spans a couple days or something). This option lets us inform
the user that they might have missed something.
In the scenario above, the output would be something like:
warning: the following files still have conflict markers:
file2
(no more unresolved files)
Differential Revision: https://phab.mercurial-scm.org/D4035
author | Kyle Lippincott <spectral@google.com> |
---|---|
date | Thu, 26 Jul 2018 17:11:03 -0700 |
parents | ae17555ef93f |
children | f8732e33bcbc |
comparison
equal
deleted
inserted
replaced
38792:afb442f58cbf | 38793:6c8e3c847977 |
---|---|
929 ) | 929 ) |
930 coreconfigitem('storage', 'revlog.optimize-delta-parent-choice', | 930 coreconfigitem('storage', 'revlog.optimize-delta-parent-choice', |
931 default=True, | 931 default=True, |
932 alias=[('format', 'aggressivemergedeltas')], | 932 alias=[('format', 'aggressivemergedeltas')], |
933 ) | 933 ) |
934 coreconfigitem('experimental', 'resolve.mark-check', | |
935 default=None, | |
936 ) | |
934 coreconfigitem('server', 'bookmarks-pushkey-compat', | 937 coreconfigitem('server', 'bookmarks-pushkey-compat', |
935 default=True, | 938 default=True, |
936 ) | 939 ) |
937 coreconfigitem('server', 'bundle1', | 940 coreconfigitem('server', 'bundle1', |
938 default=True, | 941 default=True, |