This is an archive of the discontinued Mercurial Phabricator instance.

Differential D8236

copies-tests: update to null after setup for output stability
ClosedPublic

Authored by marmoute on Mar 5 2020, 1:13 PM.

Download Raw Diff

Tags

None

Subscribers

mercurial-devel

Details

Reviewers

martinvonz
pulkit

Group Reviewers

Commits

rHG7b1f516e7606: copies-tests: update to null after setup for output stability

Summary

This avoid having '@' moving around in graph output when the graph evolves.

after this change, graph evolution is still noisy, but less.

Diff Detail

Repository

Branch

default

Lint

No Linters Available

Unit

No Unit Test Coverage

Event Timeline

marmoute created this revision.Mar 5 2020, 1:13 PM

Herald added a reviewer: hg-reviewers. · View Herald TranscriptMar 5 2020, 1:13 PM

Herald added a subscriber: mercurial-devel. · View Herald Transcript

marmoute added a child revision: D8237: copies-tests: update the analysis of the BD/DB cases.Mar 5 2020, 1:14 PM

martinvonz accepted this revision.Mar 6 2020, 2:08 AM

This revision is now accepted and ready to land.Mar 6 2020, 2:08 AM

pulkit accepted this revision.Mar 6 2020, 2:59 AM

marmoute added a commit: rHG7b1f516e7606: copies-tests: update to null after setup for output stability.Mar 6 2020, 3:23 AM

Closed by commit rHG7b1f516e7606: copies-tests: update to null after setup for output stability (authored by marmoute). · Explain Why

This revision was automatically updated to reflect the committed changes.

marmoute removed a child revision: D8237: copies-tests: update the analysis of the BD/DB cases.Mar 6 2020, 5:21 AM

Revision Contents
Changeset List

			Path	Packages
M			tests/test-copies-chain-merge.t (3 lines)

Diff 20526

tests/test-copies-chain-merge.t



	Note:			Note:
	\| In this case, the merge get conflicting information since each side have a			\| In this case, the merge get conflicting information since each side have a
	\| different way to reach 'f'.			\| different way to reach 'f'.

	final summary			final summary

				$ hg update null --quiet
	$ hg log -G			$ hg log -G
	@ 20 mEAm-0 simple merge - the other way]			o 20 mEAm-0 simple merge - the other way]
	\|\			\|\
	+---o 19 mAEm-0 simple merge - one way]			+---o 19 mAEm-0 simple merge - one way]
	\| \|/			\| \|/
	\| o 18 e-2 g -move-> f]			\| o 18 e-2 g -move-> f]
	\| \|			\| \|
	\| o 17 e-1 b -move-> g]			\| o 17 e-1 b -move-> g]
	\| \|			\| \|
	\| \| o 16 mDBm-0 simple merge - the other way]			\| \| o 16 mDBm-0 simple merge - the other way]