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

login
register
mail settings
Submitter phabricator
Date Jan. 29, 2020, 3:12 a.m.
Message ID <differential-rev-PHID-DREV-s7ddpmi3ja6xcpdow4u6-req@mercurial-scm.org>
Download mbox | patch
Permalink /patch/44732/
State Superseded
Headers show

Comments

phabricator - Jan. 29, 2020, 3:12 a.m.
mharbison72 created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.

REVISION SUMMARY
  This goes with d7622fdec3b5 <https://phab.mercurial-scm.org/rHGd7622fdec3b5fcb9150b7a53cf0ec4b550161fb1>.

REPOSITORY
  rHG Mercurial

BRANCH
  default

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

AFFECTED FILES
  tests/test-rename-merge1.t

CHANGE DETAILS




To: mharbison72, #hg-reviewers
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].