--- c:/hgdev/src/tests/test-check-code.t
+++ c:/hgdev/src/tests/test-check-code.t.err
@@ -21,11 +21,11 @@
Skipping contrib/automation/hgautomation/try_server.py it has no-che?k-code (glob)
Skipping contrib/automation/hgautomation/windows.py it has no-che?k-code (glob)
Skipping contrib/automation/hgautomation/winrm.py it has no-che?k-code (glob)
+ Skipping contrib/ci/lambda_functions/ci.py it has no-che?k-code (glob)
+ Skipping contrib/ci/lambda_functions/web.py it has no-che?k-code (glob)
Skipping contrib/fuzz/FuzzedDataProvider.h it has no-che?k-code (glob)
Skipping contrib/fuzz/standalone_fuzz_target_runner.cc it has no-che?k-code (glob)
Skipping contrib/packaging/hgpackaging/cli.py it has no-che?k-code (glob)
- Skipping contrib/ci/lambda_functions/ci.py it has no-che?k-code (glob)
- Skipping contrib/ci/lambda_functions/web.py it has no-che?k-code (glob)
Skipping contrib/packaging/hgpackaging/downloads.py it has no-che?k-code (glob)
Skipping contrib/packaging/hgpackaging/inno.py it has no-che?k-code (glob)
Skipping contrib/packaging/hgpackaging/py2exe.py it has no-che?k-code (glob)
test-copy-move-merge.t
--- c:/hgdev/src/tests/test-copy-move-merge.t
+++ c:/hgdev/src/tests/test-copy-move-merge.t.err
@@ -100,10 +100,11 @@
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
+ starting 4 threads for background file closing (?)
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
test-double-merge.t
--- c:/hgdev/src/tests/test-double-merge.t
+++ c:/hgdev/src/tests/test-double-merge.t.err
@@ -35,9 +35,10 @@
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
+ starting 4 threads for background file closing (?)
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
test-graft.t
--- c:/hgdev/src/tests/test-graft.t
+++ c:/hgdev/src/tests/test-graft.t.err
@@ -210,8 +210,9 @@
resolving manifests
branchmerge: True, force: True, partial: False
ancestor: 68795b066622, local: ef0ef43d49e7+, remote: 5d205f8b35b6
+ starting 4 threads for background file closing
+ 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
test-install.t
test-issue672.t
--- c:/hgdev/src/tests/test-issue672.t
+++ c:/hgdev/src/tests/test-issue672.t.err
@@ -63,8 +63,9 @@
resolving manifests
branchmerge: True, force: False, partial: False
ancestor: c64f439569a9, local: f4a9cff3cd0b+, remote: 746e9549ea96
+ starting 4 threads for background file closing
+ 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 +87,10 @@
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
+ starting 4 threads for background file closing (?)
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
test-merge-combination.t
test-merge-commit.t
--- c:/hgdev/src/tests/test-merge-commit.t
+++ c:/hgdev/src/tests/test-merge-commit.t.err
@@ -70,8 +70,9 @@
resolving manifests
branchmerge: True, force: False, partial: False
ancestor: 0f2ff26688b9, local: 2263c1be0967+, remote: 0555950ead28
+ starting 4 threads for background file closing
+ 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 +158,9 @@
resolving manifests
branchmerge: True, force: False, partial: False
ancestor: 0f2ff26688b9, local: 2263c1be0967+, remote: 3ffa6b9e35f0
+ starting 4 threads for background file closing
+ 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
--- c:/hgdev/src/tests/test-rename-merge1.t
+++ c:/hgdev/src/tests/test-rename-merge1.t.err
@@ -216,8 +216,9 @@
resolving manifests
branchmerge: True, force: False, partial: False
ancestor: 5151c134577e, local: 07fcbc9a74ed+, remote: f21419739508
+ starting 4 threads for background file closing
+ 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
test-rename-merge2.t
--- c:/hgdev/src/tests/test-rename-merge2.t
+++ c:/hgdev/src/tests/test-rename-merge2.t.err
@@ -85,11 +85,12 @@
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
+ starting 4 threads for background file closing (?)
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 +166,11 @@
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
+ starting 4 threads for background file closing (?)
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 +206,10 @@
resolving manifests
branchmerge: True, force: False, partial: False
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 (?)
+ starting 4 threads for background file closing
+ preserving b for resolve of b
+ starting 4 threads for background file closing (?)
+ preserving rev for resolve of rev
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 +278,9 @@
resolving manifests
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 (?)
+ starting 4 threads for background file closing
+ starting 4 threads for background file closing (?)
+ preserving rev for resolve of rev
rev: versions differ -> m (premerge)
picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob)
merging rev
@@ -341,8 +345,9 @@
resolving manifests
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 (?)
+ starting 4 threads for background file closing
+ starting 4 threads for background file closing (?)
+ preserving rev for resolve of rev
rev: versions differ -> m (premerge)
picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob)
merging rev
@@ -372,9 +377,10 @@
resolving manifests
branchmerge: True, force: False, partial: False
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 (?)
+ starting 4 threads for background file closing
+ preserving b for resolve of b
+ starting 4 threads for background file closing (?)
+ preserving rev for resolve of rev
b: both renamed from a -> m (premerge)
picked tool '* ../merge' for b (binary False symlink False changedelete False) (glob)
merging b
@@ -454,9 +460,10 @@
resolving manifests
branchmerge: True, force: False, partial: False
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 (?)
+ starting 4 threads for background file closing
+ preserving b for resolve of b
+ starting 4 threads for background file closing (?)
+ preserving rev for resolve of rev
b: both created -> m (premerge)
picked tool '* ../merge' for b (binary False symlink False changedelete False) (glob)
merging b
@@ -496,9 +503,10 @@
ancestor: 924404dff337, local: 59318016310c+, remote: bdb19105162a
a: other deleted -> r
removing a
- preserving b for resolve of b
- preserving rev for resolve of rev
- starting 4 threads for background file closing (?)
+ starting 4 threads for background file closing
+ preserving b for resolve of b
+ starting 4 threads for background file closing (?)
+ preserving rev for resolve of rev
b: both created -> m (premerge)
picked tool '* ../merge' for b (binary False symlink False changedelete False) (glob)
merging b
@@ -574,9 +582,10 @@
ancestor: 924404dff337, local: 59318016310c+, remote: bdb19105162a
a: other deleted -> r
removing a
- preserving b for resolve of b
- preserving rev for resolve of rev
- starting 4 threads for background file closing (?)
+ starting 4 threads for background file closing
+ preserving b for resolve of b
+ starting 4 threads for background file closing (?)
+ preserving rev for resolve of rev
b: both created -> m (premerge)
picked tool '* ../merge' for b (binary False symlink False changedelete False) (glob)
merging b
@@ -650,11 +659,12 @@
resolving manifests
branchmerge: True, force: False, partial: False
ancestor: 924404dff337, local: 0b76e65c8289+, remote: 4ce40f5aca24
- preserving b for resolve of b
+ starting 4 threads for background file closing
+ preserving b for resolve of b
+ starting 4 threads for background file closing (?)
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 +697,10 @@
resolving manifests
branchmerge: True, force: False, partial: False
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 (?)
+ starting 4 threads for background file closing
+ preserving b for resolve of b
+ starting 4 threads for background file closing (?)
+ preserving rev for resolve of rev
b: both renamed from a -> m (premerge)
picked tool '* ../merge' for b (binary False symlink False changedelete False) (glob)
merging b
@@ -722,9 +733,10 @@
resolving manifests
branchmerge: True, force: False, partial: False
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 (?)
+ starting 4 threads for background file closing
+ preserving b for resolve of b
+ starting 4 threads for background file closing (?)
+ preserving rev for resolve of rev
b: both renamed from a -> m (premerge)
picked tool '* ../merge' for b (binary False symlink False changedelete False) (glob)
merging b
@@ -760,10 +772,11 @@
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
+ starting 4 threads for background file closing (?)
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 +816,10 @@
resolving manifests
branchmerge: True, force: False, partial: False
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 (?)
+ starting 4 threads for background file closing
+ preserving b for resolve of b
+ starting 4 threads for background file closing (?)
+ preserving rev for resolve of rev
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
test-subrepo.t
--- c:/hgdev/src/tests/test-subrepo.t
+++ c:/hgdev/src/tests/test-subrepo.t.err
@@ -315,8 +315,9 @@
resolving manifests
branchmerge: True, force: False, partial: False
ancestor: 6747d179aa9a, local: 20a0db6fbf6c+, remote: 7af322bc1198
+ starting 4 threads for background file closing
+ 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
test-template-map.t
--- c:/hgdev/src/tests/test-template-map.t
+++ c:/hgdev/src/tests/test-template-map.t.err
@@ -138,7 +138,7 @@
$ mkdir somedir
$ echo "__base__ = somedir" > map-base-dir
$ hg log -l1 -T./map-base-dir
- abort: Is a directory: '$TESTTMP/a/somedir'
+ abort: $TESTTMP\somedir: Access is denied
[255]
Test including a built-in template map
@@ -1278,7 +1278,7 @@
Error if style is a directory:
$ hg log --style somedir
- abort: Is a directory: 'somedir'
+ abort: somedir: Access is denied
[255]
Error if style is a directory whose name is a built-in style:
test-up-local-change.t
--- c:/hgdev/src/tests/test-up-local-change.t
+++ c:/hgdev/src/tests/test-up-local-change.t.err
@@ -70,8 +70,9 @@
ancestor: 1e71731e6fbb, local: 1e71731e6fbb+, remote: c19d34741b0a
b: other deleted -> r
removing b
+ starting 4 threads for background file closing
+ 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