This is an archive of the discontinued Mercurial Phabricator instance.

Status	Author	Revision
Closed	martinvonz	D8197 cleanup: remove redundant clearing of mergestate in rebase and shelve
Closed	martinvonz	D8196 commit: clear resolved mergestate even if working copy is clean
Closed	martinvonz	D8195 commit: error out on unresolved files even if commit would be empty
Closed	martinvonz	D8194 tests: add test of committing with conflicts but no changes in wdir

Diff 20411

	#			#
	# a			# a
	#			#
	# To mark files as resolved: hg resolve --mark FILE			# To mark files as resolved: hg resolve --mark FILE

	$ hg resolve -l			$ hg resolve -l
	U a			U a

				Try to make empty commit while there are conflicts
				$ hg revert -r . a
				$ rm a.orig
				$ hg ci -m empty
				nothing changed
				[1]
				$ hg resolve -m a
				(no more unresolved files)
				$ hg resolve -l
				R a
				$ hg ci -m empty
				nothing changed
				[1]
				$ hg resolve -l
				R a

	Change/delete conflict is not allowed			Change/delete conflict is not allowed
	$ hg up -qC 3			$ hg up -qC 3
	$ hg rm foo			$ hg rm foo
	$ hg up -q 4			$ hg up -q 4

	Uses default value of "linear" when value is misspelled			Uses default value of "linear" when value is misspelled
	$ echo 'update.check = linyar' >> .hg/hgrc			$ echo 'update.check = linyar' >> .hg/hgrc