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 13406

	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			$ hg revert -qa
	$ rm foobar wat			$ rm foobar wat

				Rename a->b, then amend b->c. After unamend, should look like b->c.

				$ hg co -q 0
				$ hg mv a b
				$ hg ci -qm 'move to a b'
				$ hg mv b c
				$ hg amend
				$ hg unamend
				$ hg st --copies --change .
				A b
				a
				R a
				BROKEN: should indicate that b was renamed to c
				$ hg st --copies
				A c
				R b
				$ hg revert -qa
				$ rm c

				Rename a->b, then amend b->c, and working copy change c->d. After unamend, should look like b->d

				$ hg co -q 0
				$ hg mv a b
				$ hg ci -qm 'move to a b'
				$ hg mv b c
				$ hg amend
				$ hg mv c d
				$ hg unamend
				$ hg st --copies --change .
				A b
				a
				R a
				BROKEN: should indicate that b was renamed to d
				$ hg st --copies
				A d
				R b

	\| o 3:49bb009ca26078726b8870f1edb29fae8f7618f5 b 1			\| o 3:49bb009ca26078726b8870f1edb29fae8f7618f5 b 1
	\| \|			\| \|
	o \| 2:990982b7384266e691f1bc08ca36177adcd1c8a9 a 3			o \| 2:990982b7384266e691f1bc08ca36177adcd1c8a9 a 3
	\| \|			\| \|
	o \| 1:24d38e3cf160c7b6f5ffe82179332229886a6d34 a 2			o \| 1:24d38e3cf160c7b6f5ffe82179332229886a6d34 a 2
	\|/			\|/
	o 0:ea4e33293d4d274a2ba73150733c2612231f398c a 1			o 0:ea4e33293d4d274a2ba73150733c2612231f398c a 1


				Rename a->b, then remove b in working copy. Result should remove a.

				$ hg co -q 0
				$ hg mv a b
				$ hg ci -qm 'move a to b'
				$ hg rm b
				$ hg uncommit --config experimental.uncommitondirtywdir=True
				$ hg st --copies
				R a
				$ hg revert a

				Rename a->b, then rename b->c in working copy. Result should rename a->c.

				$ hg co -q 0
				$ hg mv a b
				$ hg ci -qm 'move a to b'
				$ hg mv b c
				$ hg uncommit --config experimental.uncommitondirtywdir=True
				$ hg st --copies
				A c
				a
				R a
				$ hg revert a
				$ hg forget c
				$ rm c

				Copy a->b1 and a->b2, then rename b1->c in working copy. Result should copy a->b2 and a->c.

				$ hg co -q 0
				$ hg cp a b1
				$ hg cp a b2
				$ hg ci -qm 'move a to b1 and b2'
				$ hg mv b1 c
				$ hg uncommit --config experimental.uncommitondirtywdir=True
				$ hg st --copies
				A b2
				a
				A c
				a