D8036: tests: stablize test-rename-merge1.t on Windows
mharbison72 (Matt Harbison)
phabricator at mercurial-scm.org
Wed Jan 29 00:23:18 EST 2020
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
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].
To: mharbison72, #hg-reviewers, martinvonz
Cc: mercurial-devel
More information about the Mercurial-devel
mailing list