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

mharbison72 (Matt Harbison) phabricator at mercurial-scm.org
Fri Jul 12 19:39:01 EDT 2019


mharbison72 created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.

REVISION SUMMARY
  The test runner doesn't always guess the right location when optional output is
  missing.  This goes with f6540aba8e3e <https://phab.mercurial-scm.org/rHGf6540aba8e3e436427c434b3e88f7fe4348554f9>.

REPOSITORY
  rHG Mercurial

REVISION DETAIL
  https://phab.mercurial-scm.org/D6640

AFFECTED FILES
  tests/test-subrepo.t

CHANGE DETAILS

diff --git a/tests/test-subrepo.t b/tests/test-subrepo.t
--- a/tests/test-subrepo.t
+++ b/tests/test-subrepo.t
@@ -315,8 +315,8 @@
   resolving manifests
    branchmerge: True, force: False, partial: False
    ancestor: 6747d179aa9a, local: 20a0db6fbf6c+, remote: 7af322bc1198
+   preserving t for resolve of t
   starting 4 threads for background file closing (?)
-   preserving t for resolve of t
    t: versions differ -> m (premerge)
   picked tool ':merge' for t (binary False symlink False changedelete False)
   merging t



To: mharbison72, #hg-reviewers
Cc: mercurial-devel


More information about the Mercurial-devel mailing list