This is an archive of the discontinued Mercurial Phabricator instance.

	Status	Author	Revision
	Closed	martinvonz	D6570 rebase: fix in-memory rebasing of copy of empty file
	Closed	martinvonz	D6569 tests: demonstrate broken in-memory rebase of copy to empty file

Diff 15652

	merging a and b to b			merging a and b to b
	saved backup bundle to $TESTTMP/rebase-rename/.hg/strip-backup/b977edf6f839-0864f570-rebase.hg			saved backup bundle to $TESTTMP/rebase-rename/.hg/strip-backup/b977edf6f839-0864f570-rebase.hg
	$ hg st --copies --change .			$ hg st --copies --change .
	A b			A b
	a			a
	R a			R a
	$ cd ..			$ cd ..

				Test rebasing a commit with copy information, where the target is empty

				$ hg init rebase-rename-empty
				$ cd rebase-rename-empty
				$ echo a > a
				$ hg ci -Aqm 'add a'
				$ cat > a
				$ hg ci -m 'make a empty'
				$ hg co -q 0
				$ hg mv a b
				$ hg ci -qm 'rename a to b'
				BROKEN: shouldn't crash
				$ hg rebase -d 1
				rebasing 2:b977edf6f839 "rename a to b" (tip)
				merging a and b to b
				abort: b@c71e275f666f: not found in manifest!
				[255]
				$ hg st --copies --change .
				A b
				a
				R a
				$ cd ..
	Rebase across a copy with --collapse			Rebase across a copy with --collapse

	$ hg init rebase-rename-collapse			$ hg init rebase-rename-collapse
	$ cd rebase-rename-collapse			$ cd rebase-rename-collapse
	$ echo a > a			$ echo a > a
	$ hg ci -Aqm 'add a'			$ hg ci -Aqm 'add a'
	$ hg mv a b			$ hg mv a b
	$ hg ci -m 'rename a to b'			$ hg ci -m 'rename a to b'