hg-stable: tests/README@da2e874fe582 (annotated)

resolve: when resolve.mark-check=abort, downgrade to warning if pats specified Previously, with --config resolve.mark-check=abort, running `hg resolve -m foo` would abort and emit a message saying to use --all. This command does not work, though: `hg resolve -m foo --all`, and it's really weird for --all to be the "--force" flag. My original goal with the option was to make it so that `hg resolve -m` (no filename arguments) was safer, which is why --all is used; in my mind, `hg resolve -m foo` should always mark it as resolved, and `--all` is how you specify "all the files", so that's why I chose `hg resolve -m --all` as the way out of `hg resolve -m` aborting. This commit makes all of this work the way it was meant to in my head :) Differential Revision: https://phab.mercurial-scm.org/D5218

332 6c869059beb4 testing fixups mpm@selenic.com parents: 331 diff changeset	1	To run the tests, do:
6c869059beb4 testing fixups mpm@selenic.com parents: 331 diff changeset	2
6c869059beb4 testing fixups mpm@selenic.com parents: 331 diff changeset	3	cd tests/
2207 8a2a7f7d9df6 Delete the shell version of run-tests Stephen Darnell <stephen@darnell.plus.com> parents: 1933 diff changeset	4	python run-tests.py
332 6c869059beb4 testing fixups mpm@selenic.com parents: 331 diff changeset	5
26421 4b0fc75f9403 urls: bulk-change primary website URLs Matt Mackall <mpm@selenic.com> parents: 8936 diff changeset	6	See https://mercurial-scm.org/wiki/WritingTests for
3934 d0bbd8ee50c7 Move test suite docs to the wiki Matt Mackall <mpm@selenic.com> parents: 3199 diff changeset	7	more information on writing tests.

author	Kyle Lippincott <spectral@google.com>
	Fri, 02 Nov 2018 11:57:45 -0700
branch	stable
changeset 40431	da2e874fe582
parent 26421	4b0fc75f9403
permissions	-rw-r--r--