This is an archive of the discontinued Mercurial Phabricator instance.

Status	Author	Revision
Closed	martinvonz	D5662 uncommit: set dirstateparents from within _fixdirstate()
Closed	martinvonz	D5661 unamend: fix unamending of renamed rename
Closed	martinvonz	D5660 uncommit: mark old node obsolete after updating dirstate
Closed	martinvonz	D5659 unamend: import "copies" module as "copiesmod" to avoid shadowing
Closed	martinvonz	D5658 tests: add more tests of uncommit/unamend with copies
Closed	martinvonz	D5657 tests: clean up after each test in test-unamend.t

Diff 13369

	--- /dev/null Thu Jan 01 00:00:00 1970 +0000			--- /dev/null Thu Jan 01 00:00:00 1970 +0000
	+++ b/bar Thu Jan 01 00:00:00 1970 +0000			+++ b/bar Thu Jan 01 00:00:00 1970 +0000
	@@ -0,0 +1,2 @@			@@ -0,0 +1,2 @@
	+foo			+foo
	+bar			+bar

	$ hg revert --all			$ hg revert --all
	forgetting bar			forgetting bar
				$ rm bar

	Unamending in middle of a stack			Unamending in middle of a stack

	$ hg glog			$ hg glog
	@ 19:7f79409af972 Added things to a and b			@ 19:7f79409af972 Added things to a and b
	\|			\|
	o 12:ec338db45d51 Added h			o 12:ec338db45d51 Added h
	\|			\|
	$ hg unamend			$ hg unamend
	abort: cannot unamend public changesets			abort: cannot unamend public changesets
	(see 'hg help phases' for details)			(see 'hg help phases' for details)
	[255]			[255]

	Testing whether unamend retains copies or not			Testing whether unamend retains copies or not

	$ hg status			$ hg status
	? bar

	$ hg mv a foo			$ hg mv a foo

	$ hg ci -m "Moved a to foo"			$ hg ci -m "Moved a to foo"
	$ hg exp --git			$ hg exp --git
	# HG changeset patch			# HG changeset patch
	# User test			# User test
	# Date 0 0			# Date 0 0

	$ hg diff --git			$ hg diff --git
	diff --git a/b b/foobar			diff --git a/b b/foobar
	rename from b			rename from b
	rename to foobar			rename to foobar
	diff --git a/c b/wat			diff --git a/c b/wat
	rename from c			rename from c
	rename to wat			rename to wat
				$ hg revert -qa
				$ rm foobar wat