[PATCH 3 of 3] tests: flag Windows specific lines about background closing as optional
Matt Harbison
mharbison72 at gmail.com
Mon Feb 29 01:14:29 EST 2016
# HG changeset patch
# User Matt Harbison <matt_harbison at yahoo.com>
# Date 1456725680 18000
# Mon Feb 29 01:01:20 2016 -0500
# Node ID 463e863aaf7db2582389c92685bed57cd0d4bcad
# Parent 7afd6d67701e7057883895324647facd50ff8db8
tests: flag Windows specific lines about background closing as optional
diff --git a/tests/test-copy-move-merge.t b/tests/test-copy-move-merge.t
--- a/tests/test-copy-move-merge.t
+++ b/tests/test-copy-move-merge.t
@@ -34,6 +34,7 @@
preserving a for resolve of b
preserving a for resolve of c
removing a
+ starting 4 threads for background file closing (?)
b: remote moved from a -> m (premerge)
picked tool ':merge' for b (binary False symlink False changedelete False)
merging a and b to b
diff --git a/tests/test-double-merge.t b/tests/test-double-merge.t
--- a/tests/test-double-merge.t
+++ b/tests/test-double-merge.t
@@ -37,6 +37,7 @@
ancestor: e6dc8efe11cc, local: 6a0df1dad128+, remote: 484bf6903104
preserving foo for resolve of bar
preserving foo for resolve of foo
+ starting 4 threads for background file closing (?)
bar: remote copied from foo -> m (premerge)
picked tool ':merge' for bar (binary False symlink False changedelete False)
merging foo and bar to bar
diff --git a/tests/test-graft.t b/tests/test-graft.t
--- a/tests/test-graft.t
+++ b/tests/test-graft.t
@@ -167,6 +167,7 @@
branchmerge: True, force: True, partial: False
ancestor: 68795b066622, local: ef0ef43d49e7+, remote: 5d205f8b35b6
preserving b for resolve of b
+ starting 4 threads for background file closing (?)
b: local copied/moved from a -> m (premerge)
picked tool ':merge' for b (binary False symlink False changedelete False)
merging b and a to b
diff --git a/tests/test-issue672.t b/tests/test-issue672.t
--- a/tests/test-issue672.t
+++ b/tests/test-issue672.t
@@ -65,6 +65,7 @@
branchmerge: True, force: False, partial: False
ancestor: c64f439569a9, local: e327dca35ac8+, remote: 746e9549ea96
preserving 1a for resolve of 1a
+ starting 4 threads for background file closing (?)
1a: local copied/moved from 1 -> m (premerge)
picked tool ':merge' for 1a (binary False symlink False changedelete False)
merging 1a and 1 to 1a
@@ -88,6 +89,7 @@
ancestor: c64f439569a9, local: 746e9549ea96+, remote: e327dca35ac8
preserving 1 for resolve of 1a
removing 1
+ starting 4 threads for background file closing (?)
1a: remote moved from 1 -> m (premerge)
picked tool ':merge' for 1a (binary False symlink False changedelete False)
merging 1 and 1a to 1a
diff --git a/tests/test-merge-commit.t b/tests/test-merge-commit.t
--- a/tests/test-merge-commit.t
+++ b/tests/test-merge-commit.t
@@ -72,6 +72,7 @@
branchmerge: True, force: False, partial: False
ancestor: 0f2ff26688b9, local: 2263c1be0967+, remote: 0555950ead28
preserving bar for resolve of bar
+ starting 4 threads for background file closing (?)
bar: versions differ -> m (premerge)
picked tool ':merge' for bar (binary False symlink False changedelete False)
merging bar
@@ -158,6 +159,7 @@
branchmerge: True, force: False, partial: False
ancestor: 0f2ff26688b9, local: 2263c1be0967+, remote: 3ffa6b9e35f0
preserving bar for resolve of bar
+ starting 4 threads for background file closing (?)
bar: versions differ -> m (premerge)
picked tool ':merge' for bar (binary False symlink False changedelete False)
merging bar
diff --git a/tests/test-merge7.t b/tests/test-merge7.t
--- a/tests/test-merge7.t
+++ b/tests/test-merge7.t
@@ -84,6 +84,7 @@
branchmerge: True, force: False, partial: False
ancestor: 96b70246a118, local: 50c3a7e29886+, remote: 40d11a4173a8
preserving test.txt for resolve of test.txt
+ starting 4 threads for background file closing (?)
test.txt: versions differ -> m (premerge)
picked tool ':merge' for test.txt (binary False symlink False changedelete False)
merging test.txt
diff --git a/tests/test-rename-dir-merge.t b/tests/test-rename-dir-merge.t
--- a/tests/test-rename-dir-merge.t
+++ b/tests/test-rename-dir-merge.t
@@ -85,6 +85,7 @@
resolving manifests
branchmerge: True, force: False, partial: False
ancestor: f9b20c0d4c51, local: 397f8b00a740+, remote: ce36d17b18fb
+ starting 4 threads for background file closing (?)
b/c: local directory rename - get from a/c -> dg
getting a/c to b/c
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
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
@@ -88,6 +88,7 @@
ancestor: 924404dff337, local: e300d1c794ec+, remote: 4ce40f5aca24
preserving a for resolve of b
preserving rev for resolve of rev
+ starting 4 threads for background file closing (?)
a: remote unchanged -> k
b: remote copied from a -> m (premerge)
picked tool 'python ../merge' for b (binary False symlink False changedelete False)
@@ -168,6 +169,7 @@
preserving a for resolve of b
preserving rev for resolve of rev
removing a
+ starting 4 threads for background file closing (?)
b: remote moved from a -> m (premerge)
picked tool 'python ../merge' for b (binary False symlink False changedelete False)
merging a and b to b
@@ -205,6 +207,7 @@
ancestor: 924404dff337, local: 02963e448370+, remote: f4db7e329e71
preserving b for resolve of b
preserving rev for resolve of rev
+ starting 4 threads for background file closing (?)
b: local copied/moved from a -> m (premerge)
picked tool 'python ../merge' for b (binary False symlink False changedelete False)
merging b and a to b
@@ -274,6 +277,7 @@
branchmerge: True, force: False, partial: False
ancestor: 924404dff337, local: 86a2aa42fc76+, remote: 97c705ade336
preserving rev for resolve of rev
+ starting 4 threads for background file closing (?)
rev: versions differ -> m (premerge)
picked tool 'python ../merge' for rev (binary False symlink False changedelete False)
merging rev
@@ -339,6 +343,7 @@
branchmerge: True, force: False, partial: False
ancestor: 924404dff337, local: 02963e448370+, remote: 97c705ade336
preserving rev for resolve of rev
+ starting 4 threads for background file closing (?)
rev: versions differ -> m (premerge)
picked tool 'python ../merge' for rev (binary False symlink False changedelete False)
merging rev
@@ -367,6 +372,7 @@
ancestor: 924404dff337, local: 62e7bf090eba+, remote: 49b6d8032493
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)
picked tool 'python ../merge' for b (binary False symlink False changedelete False)
merging b
@@ -446,6 +452,7 @@
ancestor: 924404dff337, local: 86a2aa42fc76+, remote: af30c7647fc7
preserving b for resolve of b
preserving rev for resolve of rev
+ starting 4 threads for background file closing (?)
b: both created -> m (premerge)
picked tool 'python ../merge' for b (binary False symlink False changedelete False)
merging b
@@ -486,6 +493,7 @@
preserving rev for resolve of rev
a: other deleted -> r
removing a
+ starting 4 threads for background file closing (?)
b: both created -> m (premerge)
picked tool 'python ../merge' for b (binary False symlink False changedelete False)
merging b
@@ -565,6 +573,7 @@
preserving rev for resolve of rev
a: other deleted -> r
removing a
+ starting 4 threads for background file closing (?)
b: both created -> m (premerge)
picked tool 'python ../merge' for b (binary False symlink False changedelete False)
merging b
@@ -642,6 +651,7 @@
ancestor: 924404dff337, local: 0b76e65c8289+, remote: 4ce40f5aca24
preserving b for resolve of b
preserving rev for resolve of rev
+ starting 4 threads for background file closing (?)
a: remote unchanged -> k
b: both created -> m (premerge)
picked tool 'python ../merge' for b (binary False symlink False changedelete False)
@@ -681,6 +691,7 @@
ancestor: 924404dff337, local: 02963e448370+, remote: 8dbce441892a
preserving b for resolve of b
preserving rev for resolve of rev
+ starting 4 threads for background file closing (?)
a: prompt deleted/changed -> m (premerge)
picked tool ':prompt' for a (binary False symlink False changedelete True)
remote changed a which local deleted
@@ -725,6 +736,7 @@
preserving a for resolve of a
preserving b for resolve of b
preserving rev for resolve of rev
+ starting 4 threads for background file closing (?)
a: prompt changed/deleted -> m (premerge)
picked tool ':prompt' for a (binary False symlink False changedelete True)
local changed a which remote deleted
@@ -772,6 +784,7 @@
preserving a for resolve of b
preserving rev for resolve of rev
removing a
+ starting 4 threads for background file closing (?)
b: remote moved from a -> m (premerge)
picked tool 'python ../merge' for b (binary False symlink False changedelete False)
merging a and b to b
@@ -813,6 +826,7 @@
ancestor: 924404dff337, local: 62e7bf090eba+, remote: f4db7e329e71
preserving b for resolve of b
preserving rev for resolve of rev
+ starting 4 threads for background file closing (?)
b: local copied/moved from a -> m (premerge)
picked tool 'python ../merge' for b (binary False symlink False changedelete False)
merging b and a to b
diff --git a/tests/test-strip.t b/tests/test-strip.t
--- a/tests/test-strip.t
+++ b/tests/test-strip.t
@@ -792,6 +792,7 @@
removing c
d: other deleted -> r
removing d
+ starting 4 threads for background file closing (?)
0 files updated, 0 files merged, 2 files removed, 0 files unresolved
2 changesets found
list of changesets:
diff --git a/tests/test-subrepo.t b/tests/test-subrepo.t
--- a/tests/test-subrepo.t
+++ b/tests/test-subrepo.t
@@ -259,6 +259,7 @@
resolving manifests
branchmerge: True, force: False, partial: False
ancestor: 1f14a2e2d3ec, local: f0d2028bf86d+, remote: 1831e14459c4
+ starting 4 threads for background file closing (?)
.hgsubstate: versions differ -> m (premerge)
subrepo merge f0d2028bf86d+ 1831e14459c4 1f14a2e2d3ec
subrepo t: other changed, get t:6747d179aa9a688023c4b0cad32e4c92bb7f34ad:hg
@@ -285,6 +286,7 @@
resolving manifests
branchmerge: True, force: False, partial: False
ancestor: 1831e14459c4, local: e45c8b14af55+, remote: f94576341bcf
+ starting 4 threads for background file closing (?)
.hgsubstate: versions differ -> m (premerge)
subrepo merge e45c8b14af55+ f94576341bcf 1831e14459c4
subrepo t: both sides changed
@@ -296,6 +298,7 @@
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 (?)
t: versions differ -> m (premerge)
picked tool ':merge' for t (binary False symlink False changedelete False)
merging t
diff --git a/tests/test-up-local-change.t b/tests/test-up-local-change.t
--- a/tests/test-up-local-change.t
+++ b/tests/test-up-local-change.t
@@ -73,6 +73,7 @@
preserving a for resolve of a
b: other deleted -> r
removing b
+ starting 4 threads for background file closing (?)
a: versions differ -> m (premerge)
picked tool 'true' for a (binary False symlink False changedelete False)
merging a
More information about the Mercurial-devel
mailing list