mharbison72 created this revision. Herald added a reviewer: hg-reviewers. Herald added a subscriber: mercurial-patches.
REVISION SUMMARY I didn't track down where this change occurred. I assume it's related to some buffering changes, and/or an explicit flush somewhere. REPOSITORY rHG Mercurial BRANCH default REVISION DETAIL https://phab.mercurial-scm.org/D9539 AFFECTED FILES tests/test-copy-move-merge.t tests/test-double-merge.t tests/test-graft.t tests/test-issue672.t tests/test-merge-commit.t tests/test-merge7.t tests/test-rename-merge1.t tests/test-rename-merge2.t tests/test-subrepo.t tests/test-up-local-change.t CHANGE DETAILS 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 @@ -70,8 +70,8 @@ ancestor: 1e71731e6fbb, local: 1e71731e6fbb+, remote: c19d34741b0a b: other deleted -> r removing b + starting 4 threads for background file closing (?) preserving a for resolve of a - 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 diff --git a/tests/test-subrepo.t b/tests/test-subrepo.t --- a/tests/test-subrepo.t +++ b/tests/test-subrepo.t @@ -315,8 +315,8 @@ resolving manifests branchmerge: True, force: False, partial: False ancestor: 6747d179aa9a, local: 20a0db6fbf6c+, remote: 7af322bc1198 + starting 4 threads for background file closing (?) 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-rename-merge2.t b/tests/test-rename-merge2.t --- a/tests/test-rename-merge2.t +++ b/tests/test-rename-merge2.t @@ -85,11 +85,10 @@ resolving manifests branchmerge: True, force: False, partial: False ancestor: 924404dff337, local: e300d1c794ec+, remote: 4ce40f5aca24 + starting 4 threads for background file closing (?) preserving a for resolve of b preserving rev for resolve of rev - starting 4 threads for background file closing (?) b: remote copied from a -> m (premerge) - starting 4 threads for background file closing (?) picked tool '* ../merge' for b (binary False symlink False changedelete False) (glob) merging a and b to b my b@e300d1c794ec+ other b@4ce40f5aca24 ancestor a@924404dff337 @@ -165,10 +164,10 @@ resolving manifests branchmerge: True, force: False, partial: False ancestor: 924404dff337, local: e300d1c794ec+, remote: bdb19105162a + starting 4 threads for background file closing (?) 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 '* ../merge' for b (binary False symlink False changedelete False) (glob) merging a and b to b @@ -204,9 +203,9 @@ resolving manifests branchmerge: True, force: False, partial: False ancestor: 924404dff337, local: 02963e448370+, remote: f4db7e329e71 + starting 4 threads for background file closing (?) 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 '* ../merge' for b (binary False symlink False changedelete False) (glob) merging b and a to b @@ -275,8 +274,8 @@ resolving manifests branchmerge: True, force: False, partial: False ancestor: 924404dff337, local: 86a2aa42fc76+, remote: 97c705ade336 + starting 4 threads for background file closing (?) preserving rev for resolve of rev - starting 4 threads for background file closing (?) rev: versions differ -> m (premerge) picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob) merging rev @@ -341,8 +340,8 @@ resolving manifests branchmerge: True, force: False, partial: False ancestor: 924404dff337, local: 02963e448370+, remote: 97c705ade336 + starting 4 threads for background file closing (?) preserving rev for resolve of rev - starting 4 threads for background file closing (?) rev: versions differ -> m (premerge) picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob) merging rev @@ -372,9 +371,9 @@ resolving manifests branchmerge: True, force: False, partial: False ancestor: 924404dff337, local: 62e7bf090eba+, remote: 49b6d8032493 + starting 4 threads for background file closing (?) 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 '* ../merge' for b (binary False symlink False changedelete False) (glob) merging b @@ -454,9 +453,9 @@ resolving manifests branchmerge: True, force: False, partial: False ancestor: 924404dff337, local: 86a2aa42fc76+, remote: af30c7647fc7 + starting 4 threads for background file closing (?) 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 '* ../merge' for b (binary False symlink False changedelete False) (glob) merging b @@ -496,9 +495,9 @@ ancestor: 924404dff337, local: 59318016310c+, remote: bdb19105162a a: other deleted -> r removing a + starting 4 threads for background file closing (?) 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 '* ../merge' for b (binary False symlink False changedelete False) (glob) merging b @@ -574,9 +573,9 @@ ancestor: 924404dff337, local: 59318016310c+, remote: bdb19105162a a: other deleted -> r removing a + starting 4 threads for background file closing (?) 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 '* ../merge' for b (binary False symlink False changedelete False) (glob) merging b @@ -650,11 +649,10 @@ resolving manifests branchmerge: True, force: False, partial: False ancestor: 924404dff337, local: 0b76e65c8289+, remote: 4ce40f5aca24 + starting 4 threads for background file closing (?) 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@4ce40f5aca24 ancestor a@924404dff337 @@ -687,9 +685,9 @@ resolving manifests branchmerge: True, force: False, partial: False ancestor: 924404dff337, local: 02963e448370+, remote: 8dbce441892a + starting 4 threads for background file closing (?) 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 '* ../merge' for b (binary False symlink False changedelete False) (glob) merging b @@ -722,9 +720,9 @@ resolving manifests branchmerge: True, force: False, partial: False ancestor: 924404dff337, local: 0b76e65c8289+, remote: bdb19105162a + starting 4 threads for background file closing (?) 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 '* ../merge' for b (binary False symlink False changedelete False) (glob) merging b @@ -760,10 +758,10 @@ resolving manifests branchmerge: True, force: False, partial: False ancestor: 924404dff337, local: e300d1c794ec+, remote: 49b6d8032493 + starting 4 threads for background file closing (?) 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 '* ../merge' for b (binary False symlink False changedelete False) (glob) merging a and b to b @@ -803,9 +801,9 @@ resolving manifests branchmerge: True, force: False, partial: False ancestor: 924404dff337, local: 62e7bf090eba+, remote: f4db7e329e71 + starting 4 threads for background file closing (?) 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 '* ../merge' for b (binary False symlink False changedelete False) (glob) merging b and a to b 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 @@ -216,8 +216,8 @@ resolving manifests branchmerge: True, force: False, partial: False ancestor: 5151c134577e, local: 07fcbc9a74ed+, remote: f21419739508 + starting 4 threads for background file closing (?) preserving z for resolve of z - starting 4 threads for background file closing (?) z: both renamed from y -> m (premerge) picked tool ':merge3' for z (binary False symlink False changedelete False) merging z diff --git a/tests/test-merge7.t b/tests/test-merge7.t --- a/tests/test-merge7.t +++ b/tests/test-merge7.t @@ -84,8 +84,8 @@ resolving manifests branchmerge: True, force: False, partial: False ancestor: 96b70246a118, local: 50c3a7e29886+, remote: 40d11a4173a8 + starting 4 threads for background file closing (?) 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-merge-commit.t b/tests/test-merge-commit.t --- a/tests/test-merge-commit.t +++ b/tests/test-merge-commit.t @@ -70,8 +70,8 @@ resolving manifests branchmerge: True, force: False, partial: False ancestor: 0f2ff26688b9, local: 2263c1be0967+, remote: 0555950ead28 + starting 4 threads for background file closing (?) 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 @@ -157,8 +157,8 @@ resolving manifests branchmerge: True, force: False, partial: False ancestor: 0f2ff26688b9, local: 2263c1be0967+, remote: 3ffa6b9e35f0 + starting 4 threads for background file closing (?) 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-issue672.t b/tests/test-issue672.t --- a/tests/test-issue672.t +++ b/tests/test-issue672.t @@ -63,8 +63,8 @@ resolving manifests branchmerge: True, force: False, partial: False ancestor: c64f439569a9, local: f4a9cff3cd0b+, remote: 746e9549ea96 + starting 4 threads for background file closing (?) 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 @@ -86,9 +86,9 @@ resolving manifests branchmerge: True, force: False, partial: False ancestor: c64f439569a9, local: 746e9549ea96+, remote: f4a9cff3cd0b + starting 4 threads for background file closing (?) 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-graft.t b/tests/test-graft.t --- a/tests/test-graft.t +++ b/tests/test-graft.t @@ -210,8 +210,8 @@ resolving manifests branchmerge: True, force: True, partial: False ancestor: 68795b066622, local: ef0ef43d49e7+, remote: 5d205f8b35b6 + starting 4 threads for background file closing (?) 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-double-merge.t b/tests/test-double-merge.t --- a/tests/test-double-merge.t +++ b/tests/test-double-merge.t @@ -35,9 +35,9 @@ resolving manifests branchmerge: True, force: False, partial: False ancestor: e6dc8efe11cc, local: 6a0df1dad128+, remote: 484bf6903104 + starting 4 threads for background file closing (?) 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-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 @@ -100,10 +100,10 @@ resolving manifests branchmerge: True, force: False, partial: False ancestor: b8bf91eeebbc, local: add3f11052fa+, remote: 17c05bb7fcb6 + starting 4 threads for background file closing (?) 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 To: mharbison72, #hg-reviewers Cc: mercurial-patches, mercurial-devel _______________________________________________ Mercurial-devel mailing list Mercurial-devel@mercurial-scm.org https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel
