Show More
@@ -4603,7 +4603,7 b' def resolve(ui, repo, *pats, **opts):' | |||||
4603 | tocomplete = [] |
|
4603 | tocomplete = [] | |
4604 | hasconflictmarkers = [] |
|
4604 | hasconflictmarkers = [] | |
4605 | if mark: |
|
4605 | if mark: | |
4606 |
markcheck = ui.config(' |
|
4606 | markcheck = ui.config('commands', 'resolve.mark-check') | |
4607 | for f in ms: |
|
4607 | for f in ms: | |
4608 | if not m(f): |
|
4608 | if not m(f): | |
4609 | continue |
|
4609 | continue |
@@ -193,6 +193,9 b" coreconfigitem('commands', 'grep.all-fil" | |||||
193 | coreconfigitem('commands', 'resolve.confirm', |
|
193 | coreconfigitem('commands', 'resolve.confirm', | |
194 | default=False, |
|
194 | default=False, | |
195 | ) |
|
195 | ) | |
|
196 | coreconfigitem('commands', 'resolve.mark-check', | |||
|
197 | default=None, | |||
|
198 | ) | |||
196 | coreconfigitem('commands', 'show.aliasprefix', |
|
199 | coreconfigitem('commands', 'show.aliasprefix', | |
197 | default=list, |
|
200 | default=list, | |
198 | ) |
|
201 | ) | |
@@ -940,9 +943,6 b" coreconfigitem('storage', 'revlog.optimi" | |||||
940 | default=True, |
|
943 | default=True, | |
941 | alias=[('format', 'aggressivemergedeltas')], |
|
944 | alias=[('format', 'aggressivemergedeltas')], | |
942 | ) |
|
945 | ) | |
943 | coreconfigitem('experimental', 'resolve.mark-check', |
|
|||
944 | default=None, |
|
|||
945 | ) |
|
|||
946 | coreconfigitem('server', 'bookmarks-pushkey-compat', |
|
946 | coreconfigitem('server', 'bookmarks-pushkey-compat', | |
947 | default=True, |
|
947 | default=True, | |
948 | ) |
|
948 | ) |
@@ -443,6 +443,16 b' effect and style see :hg:`help color`.' | |||||
443 | :hg:`resolve --all`. |
|
443 | :hg:`resolve --all`. | |
444 | (default: False) |
|
444 | (default: False) | |
445 |
|
445 | |||
|
446 | ``resolve.mark-check`` | |||
|
447 | Determines what level of checking :hg:`resolve --mark` will perform before | |||
|
448 | marking files as resolved. Valid values are ``none`, ``warn``, and | |||
|
449 | ``abort``. ``warn`` will output a warning listing the file(s) that still | |||
|
450 | have conflict markers in them, but will still mark everything resolved. | |||
|
451 | ``abort`` will output the same warning but will not mark things as resolved. | |||
|
452 | If --all is passed and this is set to ``abort``, only a warning will be | |||
|
453 | shown (an error will not be raised). | |||
|
454 | (default: ``none``) | |||
|
455 | ||||
446 | ``status.relative`` |
|
456 | ``status.relative`` | |
447 | Make paths in :hg:`status` output relative to the current directory. |
|
457 | Make paths in :hg:`status` output relative to the current directory. | |
448 | (default: False) |
|
458 | (default: False) |
@@ -383,7 +383,7 b' resolve -m can be configured to look for' | |||||
383 | U file1 |
|
383 | U file1 | |
384 | U file2 |
|
384 | U file2 | |
385 | $ echo 'remove markers' > file1 |
|
385 | $ echo 'remove markers' > file1 | |
386 |
$ hg --config |
|
386 | $ hg --config commands.resolve.mark-check=abort resolve -m | |
387 | warning: the following files still have conflict markers: |
|
387 | warning: the following files still have conflict markers: | |
388 | file2 |
|
388 | file2 | |
389 | abort: conflict markers detected |
|
389 | abort: conflict markers detected | |
@@ -393,7 +393,7 b' resolve -m can be configured to look for' | |||||
393 | U file1 |
|
393 | U file1 | |
394 | U file2 |
|
394 | U file2 | |
395 | Try with --all from the hint |
|
395 | Try with --all from the hint | |
396 |
$ hg --config |
|
396 | $ hg --config commands.resolve.mark-check=abort resolve -m --all | |
397 | warning: the following files still have conflict markers: |
|
397 | warning: the following files still have conflict markers: | |
398 | file2 |
|
398 | file2 | |
399 | (no more unresolved files) |
|
399 | (no more unresolved files) | |
@@ -404,7 +404,7 b' Try with --all from the hint' | |||||
404 | $ hg resolve -l |
|
404 | $ hg resolve -l | |
405 | U file1 |
|
405 | U file1 | |
406 | U file2 |
|
406 | U file2 | |
407 |
$ hg --config |
|
407 | $ hg --config commands.resolve.mark-check=warn resolve -m | |
408 | warning: the following files still have conflict markers: |
|
408 | warning: the following files still have conflict markers: | |
409 | file2 |
|
409 | file2 | |
410 | (no more unresolved files) |
|
410 | (no more unresolved files) | |
@@ -416,7 +416,7 b' If the file is already marked as resolve' | |||||
416 | $ hg resolve -l |
|
416 | $ hg resolve -l | |
417 | U file1 |
|
417 | U file1 | |
418 | R file2 |
|
418 | R file2 | |
419 |
$ hg --config |
|
419 | $ hg --config commands.resolve.mark-check=warn resolve -m | |
420 | (no more unresolved files) |
|
420 | (no more unresolved files) | |
421 | $ hg resolve -l |
|
421 | $ hg resolve -l | |
422 | R file1 |
|
422 | R file1 |
General Comments 0
You need to be logged in to leave comments.
Login now