( )⚙ D6640 tests: properly position conditional output on Windows in test-subrepo.t

This is an archive of the discontinued Mercurial Phabricator instance.

Differential D6640

tests: properly position conditional output on Windows in test-subrepo.t
ClosedPublic

Authored by mharbison72 on Jul 12 2019, 7:38 PM.

Download Raw Diff

Tags

None

Subscribers

mercurial-devel

Details

Reviewers

Group Reviewers

Commits

rHG5c36a7e4912a: tests: properly position conditional output on Windows in test-subrepo.t
rHG8486675a08e1: tests: properly position conditional output on Windows in test-subrepo.t

Summary

The test runner doesn't always guess the right location when optional output is
missing. This goes with f6540aba8e3e.

Diff Detail

Repository

Lint

Lint Skipped

Unit

Unit Tests Skipped

Event Timeline

mharbison72 created this revision.Jul 12 2019, 7:38 PM

Herald added a reviewer: hg-reviewers. · View Herald TranscriptJul 12 2019, 7:38 PM

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

pulkit accepted this revision.Jul 15 2019, 9:54 AM

This revision is now accepted and ready to land.Jul 15 2019, 9:54 AM

mharbison72 added a commit: rHG8486675a08e1: tests: properly position conditional output on Windows in test-subrepo.t.Jul 15 2019, 10:14 AM

Closed by commit rHG8486675a08e1: tests: properly position conditional output on Windows in test-subrepo.t (authored by mharbison72). · Explain Why

This revision was automatically updated to reflect the committed changes.

mharbison72 added a commit: rHG5c36a7e4912a: tests: properly position conditional output on Windows in test-subrepo.t.Jul 15 2019, 7:45 PM

Revision Contents
Changeset List

			Path	Packages
M			tests/test-subrepo.t (2 lines)

Diff 15899

tests/test-subrepo.t

	subrepository t diverged (local revision: 20a0db6fbf6c, remote revision: 7af322bc1198)			subrepository t diverged (local revision: 20a0db6fbf6c, remote revision: 7af322bc1198)
	starting 4 threads for background file closing (?)			starting 4 threads for background file closing (?)
	you can (m)erge, keep (l)ocal [working copy] or keep (r)emote [merge rev].			you can (m)erge, keep (l)ocal [working copy] or keep (r)emote [merge rev].
	what do you want to do? m			what do you want to do? m
	merging subrepository "t"			merging subrepository "t"
	resolving manifests			resolving manifests
	branchmerge: True, force: False, partial: False			branchmerge: True, force: False, partial: False
	ancestor: 6747d179aa9a, local: 20a0db6fbf6c+, remote: 7af322bc1198			ancestor: 6747d179aa9a, local: 20a0db6fbf6c+, remote: 7af322bc1198
	starting 4 threads for background file closing (?)
	preserving t for resolve of t			preserving t for resolve of t
				starting 4 threads for background file closing (?)
	t: versions differ -> m (premerge)			t: versions differ -> m (premerge)
	picked tool ':merge' for t (binary False symlink False changedelete False)			picked tool ':merge' for t (binary False symlink False changedelete False)
	merging t			merging t
	my t@20a0db6fbf6c+ other t@7af322bc1198 ancestor t@6747d179aa9a			my t@20a0db6fbf6c+ other t@7af322bc1198 ancestor t@6747d179aa9a
	t: versions differ -> m (merge)			t: versions differ -> m (merge)
	picked tool ':merge' for t (binary False symlink False changedelete False)			picked tool ':merge' for t (binary False symlink False changedelete False)
	my t@20a0db6fbf6c+ other t@7af322bc1198 ancestor t@6747d179aa9a			my t@20a0db6fbf6c+ other t@7af322bc1198 ancestor t@6747d179aa9a
	warning: conflicts while merging t! (edit, then use 'hg resolve --mark')			warning: conflicts while merging t! (edit, then use 'hg resolve --mark')