##// END OF EJS Templates
resolve: when resolve.mark-check=abort, downgrade to warning if pats specified...
Kyle Lippincott -
r40520:da2e874f stable
parent child Browse files
Show More
@@ -4912,7 +4912,7 b' def resolve(ui, repo, *pats, **opts):'
4912 if hasconflictmarkers:
4912 if hasconflictmarkers:
4913 ui.warn(_('warning: the following files still have conflict '
4913 ui.warn(_('warning: the following files still have conflict '
4914 'markers:\n ') + '\n '.join(hasconflictmarkers) + '\n')
4914 'markers:\n ') + '\n '.join(hasconflictmarkers) + '\n')
4915 if markcheck == 'abort' and not all:
4915 if markcheck == 'abort' and not all and not pats:
4916 raise error.Abort(_('conflict markers detected'),
4916 raise error.Abort(_('conflict markers detected'),
4917 hint=_('use --all to mark anyway'))
4917 hint=_('use --all to mark anyway'))
4918
4918
@@ -445,6 +445,19 b" Test explicitly setting the otion to 'no"
445 $ hg resolve -l
445 $ hg resolve -l
446 R file1
446 R file1
447 R file2
447 R file2
448 Test with marking an explicit file as resolved, this should not abort (since
449 there's no --force flag, we have no way of combining --all with a filename)
450 $ hg resolve --unmark
451 $ hg resolve -l
452 U file1
453 U file2
454 (This downgrades to a warning since an explicit file was specified).
455 $ hg --config commands.resolve.mark-check=abort resolve -m file2
456 warning: the following files still have conflict markers:
457 file2
458 $ hg resolve -l
459 U file1
460 R file2
448 Testing the --re-merge flag
461 Testing the --re-merge flag
449 $ hg resolve --unmark file1
462 $ hg resolve --unmark file1
450 $ hg resolve -l
463 $ hg resolve -l
General Comments 0
You need to be logged in to leave comments. Login now