This is an archive of the discontinued Mercurial Phabricator instance.

Status	Author	Revision
Closed	marmoute	D11852 update: reformat the `commands.update.check` help
Closed	marmoute	D11851 update: properly overwrite `check` config with `--no-` variants
Closed	marmoute	D11850 update: add a test for `--merge` overriding the "abort" config
Closed	marmoute	D11848 update: use long version of the flag in the test

Diff 31300

	parent=1			parent=1
	M foo			M foo

	$ revtest '--merge none dirty linear' dirty 1 2 --check			$ revtest '--merge none dirty linear' dirty 1 2 --check
	abort: uncommitted changes			abort: uncommitted changes
	parent=1			parent=1
	M foo			M foo

				$ revtest '--merge none dirty linear' dirty 1 2 --merge
				1 files updated, 0 files merged, 0 files removed, 0 files unresolved
				parent=2
				M foo

	$ revtest 'none dirty linear' dirty 1 2 --clean			$ revtest 'none dirty linear' dirty 1 2 --clean
	2 files updated, 0 files merged, 0 files removed, 0 files unresolved			2 files updated, 0 files merged, 0 files removed, 0 files unresolved
	parent=2			parent=2

	$ echo 'update.check = none' >> .hg/hgrc			$ echo 'update.check = none' >> .hg/hgrc

	$ revtest 'none dirty cross' dirty 3 4			$ revtest 'none dirty cross' dirty 3 4
	1 files updated, 0 files merged, 0 files removed, 0 files unresolved			1 files updated, 0 files merged, 0 files removed, 0 files unresolved