This is an archive of the discontinued Mercurial Phabricator instance.

Status	Author	Revision
Closed	martinvonz	D8028 tests: use full `uncommit` command name in tests
Closed	martinvonz	D8027 graft: default `base` argument to common case of `ctx.p1()`
Closed	martinvonz	D8026 graft: let caller pass in overlayworkingctx to merge.graft()

Diff 19719

	$ cd issue5977			$ cd issue5977
	$ echo 'super critical info!' > a			$ echo 'super critical info!' > a
	$ hg ci -Am 'add a'			$ hg ci -Am 'add a'
	adding a			adding a
	$ echo 'foo' > b			$ echo 'foo' > b
	$ hg add b			$ hg add b
	$ hg status			$ hg status
	A b			A b
	$ hg unc a			$ hg uncommit a
	note: keeping empty commit			note: keeping empty commit
	$ cat a			$ cat a
	super critical info!			super critical info!
	$ hg log			$ hg log
	changeset: 1:656ba143d384			changeset: 1:656ba143d384
	tag: tip			tag: tip
	parent: -1:000000000000			parent: -1:000000000000
	user: test			user: test
	date: Thu Jan 01 00:00:00 1970 +0000			date: Thu Jan 01 00:00:00 1970 +0000
	summary: add a			summary: add a

	$ hg ci -Am 'add b'			$ hg ci -Am 'add b'
	$ echo 'foo bar' > b			$ echo 'foo bar' > b
	$ hg unc b			$ hg uncommit b
	abort: uncommitted changes			abort: uncommitted changes
	(requires --allow-dirty-working-copy to uncommit)			(requires --allow-dirty-working-copy to uncommit)
	[255]			[255]
	$ hg unc --allow-dirty-working-copy b			$ hg uncommit --allow-dirty-working-copy b
	$ hg log			$ hg log
	changeset: 3:30fa958635b2			changeset: 3:30fa958635b2
	tag: tip			tag: tip
	parent: 1:656ba143d384			parent: 1:656ba143d384
	user: test			user: test
	date: Thu Jan 01 00:00:00 1970 +0000			date: Thu Jan 01 00:00:00 1970 +0000
	summary: add b			summary: add b