Patchwork D8146: tests: stabilize test-rename-merge2.t on Windows

login
register
mail settings
Submitter phabricator
Date Feb. 25, 2020, 2:53 p.m.
Message ID <a2417c3143c50dc212d1bdad720097ca@localhost.localdomain>
Download mbox | patch
Permalink /patch/45312/
State Not Applicable
Headers show

Comments

phabricator - Feb. 25, 2020, 2:53 p.m.
Closed by commit rHG35d2afc6966a: tests: stabilize test-rename-merge2.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/D8146?vs=20291&id=20296

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

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

AFFECTED FILES
  tests/test-rename-merge2.t

CHANGE DETAILS




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

Patch

diff --git a/tests/test-rename-merge2.t b/tests/test-rename-merge2.t
--- a/tests/test-rename-merge2.t
+++ b/tests/test-rename-merge2.t
@@ -722,8 +722,8 @@ 
    ancestor: 924404dff337, local: 0b76e65c8289+, remote: bdb19105162a
    preserving b for resolve of b
    preserving rev for resolve of rev
+  starting 4 threads for background file closing (?)
    b: both renamed from a -> m (premerge)
-  starting 4 threads for background file closing (?)
   picked tool '* ../merge' for b (binary False symlink False changedelete False) (glob)
   merging b
   my b@0b76e65c8289+ other b@bdb19105162a ancestor a@924404dff337