This is an archive of the discontinued Mercurial Phabricator instance.

	Status	Author	Revision
	Closed	martinvonz	D6380 copies: fix duplicatecopies() with overlay context
	Closed	martinvonz	D6379 tests: demonstrate crash when rebasing across copy with --collapse

Diff 15123

	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 ..

				Rebase across a copy with --collapse

				$ hg init rebase-rename-collapse
				$ cd rebase-rename-collapse
				$ echo a > a
				$ hg ci -Aqm 'add a'
				$ hg mv a b
				$ hg ci -m 'rename a to b'
				$ hg co -q 0
				$ echo a2 > a
				$ hg ci -qm 'modify a'
				BROKEN: obviously...
				$ hg rebase -r . -d 1 --collapse
				rebasing 2:41c4ea50d4cf "modify a" (tip)
				merging b and a to b
				abort: a@b977edf6f839: not found in manifest!
				[255]
				$ cd ..

	Test rebasing when the file we are merging in destination is empty			Test rebasing when the file we are merging in destination is empty

	$ hg init test			$ hg init test
	$ cd test			$ cd test
	$ echo a > foo			$ echo a > foo
	$ hg ci -Aqm 'added a to foo'			$ hg ci -Aqm 'added a to foo'

	$ rm foo			$ rm foo