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

login
register
mail settings
Submitter phabricator
Date July 15, 2019, 2:14 p.m.
Message ID <5d4865113a74f7d53db37c41ac55a32c@localhost.localdomain>
Download mbox | patch
Permalink /patch/40929/
State Not Applicable
Headers show

Comments

phabricator - July 15, 2019, 2:14 p.m.
Closed by commit rHG8486675a08e1: tests: properly position conditional output on Windows in test-subrepo.t (authored by mharbison72).
This revision was automatically updated to reflect the committed changes.

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST UPDATE
  https://phab.mercurial-scm.org/D6640?vs=15899&id=15912

CHANGES SINCE LAST ACTION
  https://phab.mercurial-scm.org/D6640/new/

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

AFFECTED FILES
  tests/test-subrepo.t

CHANGE DETAILS




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

Patch

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