This is an archive of the discontinued Mercurial Phabricator instance.

	Status	Author	Revision
	Closed	hooper	D5245 fix: add extra field to fixed revisions to avoid creating obsolescence cycles
	Closed	hooper	D5244 cleanup: use revision numbers instead of hashes in test output

Diff 12483


	$ printf "FOO\n" > foo.whole			$ printf "FOO\n" > foo.whole
	$ hg commit -Aqm "add foo"			$ hg commit -Aqm "add foo"
	$ printf "foo\n" > foo.whole			$ printf "foo\n" > foo.whole
	$ hg commit -m "edit foo"			$ hg commit -m "edit foo"
	$ printf "BAR\n" > bar.whole			$ printf "BAR\n" > bar.whole
	$ hg commit -Aqm "add bar"			$ hg commit -Aqm "add bar"

	$ hg log --graph --template '{node\|shortest} {files}'			$ hg log --graph --template '{rev} {files}'
	@ bc05 bar.whole			@ 2 bar.whole
	\|			\|
	o 4fd2 foo.whole			o 1 foo.whole
	\|			\|
	o f9ac foo.whole			o 0 foo.whole

	$ hg fix -r 0:2			$ hg fix -r 0:2
	$ hg log --graph --template '{node\|shortest} {files}'			$ hg log --graph --template '{rev} {files}'
	o b4e2 bar.whole			o 4 bar.whole
	\|			\|
	o 59f4			o 3
	\|			\|
	\| @ bc05 bar.whole			\| @ 2 bar.whole
	\| \|			\| \|
	\| x 4fd2 foo.whole			\| x 1 foo.whole
	\|/			\|/
	o f9ac foo.whole			o 0 foo.whole


	$ cd ..			$ cd ..

	It's also possible that the child needs absolutely no changes, but we still			It's also possible that the child needs absolutely no changes, but we still
	need to replace it to update its parent. If we skipped replacing the child			need to replace it to update its parent. If we skipped replacing the child
	because it had no file content changes, it would become an orphan for no good			because it had no file content changes, it would become an orphan for no good
	reason.			reason.