This is an archive of the discontinued Mercurial Phabricator instance.

Status	Author	Revision
Closed	martinvonz	D3819 split: preserve phase of commit that is being split
Closed	martinvonz	D3818 scmutil: make cleanupnodes optionally also fix the phase
Closed	martinvonz	D3817 tests: add test of uncommit with default phase as secret

Diff 9233


	Uncommit with draft parent			Uncommit with draft parent

	$ hg uncommit			$ hg uncommit
	$ hg phase -r .			$ hg phase -r .
	12: draft			12: draft
	$ hg commit -m 'update ab again'			$ hg commit -m 'update ab again'

				Phase is preserved

				$ hg uncommit --keep --config phases.new-commit=secret
				$ hg phase -r .
				15: draft
				$ hg commit --amend -m 'update ab again'

	Uncommit with public parent			Uncommit with public parent

	$ hg phase -p "::.^"			$ hg phase -p "::.^"
	$ hg uncommit			$ hg uncommit
	$ hg phase -r .			$ hg phase -r .
	12: public			12: public

	Partial uncommit with public parent			Partial uncommit with public parent

	$ echo xyz > xyz			$ echo xyz > xyz
	$ hg add xyz			$ hg add xyz
	$ hg commit -m "update ab and add xyz"			$ hg commit -m "update ab and add xyz"
	$ hg uncommit xyz			$ hg uncommit xyz
	$ hg status			$ hg status
	A xyz			A xyz
	$ hg phase -r .			$ hg phase -r .
	16: draft			18: draft
	$ hg phase -r ".^"			$ hg phase -r ".^"
	12: public			12: public

	Uncommit leaving an empty changeset			Uncommit leaving an empty changeset

	$ cd $TESTTMP			$ cd $TESTTMP
	$ hg init repo1			$ hg init repo1
	$ cd repo1			$ cd repo1