Patchwork D8036: tests: stablize test-rename-merge1.t on Windows

login
register
mail settings
Submitter phabricator
Date Jan. 29, 2020, 5:23 a.m.
Message ID <61c181deb85b44b3d3468c33afd0cff8@localhost.localdomain>
Download mbox | patch
Permalink /patch/44733/
State Not Applicable
Headers show

Comments

phabricator - Jan. 29, 2020, 5:23 a.m.
Closed by commit rHG5de70f798ea7: tests: stablize test-rename-merge1.t on Windows (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/D8036?vs=19672&id=19673

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

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

AFFECTED FILES
  tests/test-rename-merge1.t

CHANGE DETAILS




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

Patch

diff --git a/tests/test-rename-merge1.t b/tests/test-rename-merge1.t
--- a/tests/test-rename-merge1.t
+++ b/tests/test-rename-merge1.t
@@ -213,6 +213,7 @@ 
    ancestor: 5151c134577e, local: 07fcbc9a74ed+, remote: f21419739508
    preserving x for resolve of x
    preserving z for resolve of z
+  starting 4 threads for background file closing (?)
    x: prompt changed/deleted -> m (premerge)
   picked tool ':prompt' for x (binary False symlink False changedelete True)
   file 'x' was deleted in other [merge rev] but was modified in local [working copy].