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.

Details

Reviewers
pulkit
Group Reviewers
hg-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
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Revision Contents
Changeset List

PathPackages
Mtests/test-subrepo.t (2 lines)

Diff 15912

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')