This is an archive of the discontinued Mercurial Phabricator instance.

Differential D9539

tests: correct the output order about starting a background thread for Windows
ClosedPublic

Authored by mharbison72 on Dec 7 2020, 11:00 PM.

Details

Reviewers
pulkit
Group Reviewers
hg-reviewers
Commits
rHG69429972ff1f: tests: correct the output order about starting a background thread for Windows
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.

Diff Detail

Repository
rHG Mercurial
Branch
default
Lint
No Linters Available
Unit
No Unit Test Coverage

Event Timeline

mharbison72 created this revision.Dec 7 2020, 11:00 PM
pulkit accepted this revision.Dec 8 2020, 2:19 AM
pulkit added a subscriber: pulkit.

I reordered the related code few months and hence these changes.

This revision is now accepted and ready to land.Dec 8 2020, 2:19 AM

Revision Contents
Changeset List

Diff 24099

tests/test-copy-move-merge.t

all copies found (* = to merge, ! = divergent, % = renamed and deleted): all copies found (* = to merge, ! = divergent, % = renamed and deleted):
on remote side: on remote side:
src: 'a' -> dst: 'b' * src: 'a' -> dst: 'b' *
src: 'a' -> dst: 'c' * src: 'a' -> dst: 'c' *
checking for directory renames checking for directory renames
resolving manifests resolving manifests
branchmerge: True, force: False, partial: False branchmerge: True, force: False, partial: False
ancestor: b8bf91eeebbc, local: add3f11052fa+, remote: 17c05bb7fcb6 ancestor: b8bf91eeebbc, local: add3f11052fa+, remote: 17c05bb7fcb6
starting 4 threads for background file closing (?)
preserving a for resolve of b preserving a for resolve of b
preserving a for resolve of c preserving a for resolve of c
removing a removing a
starting 4 threads for background file closing (?)
b: remote moved from a -> m (premerge) b: remote moved from a -> m (premerge)
picked tool ':merge' for b (binary False symlink False changedelete False) picked tool ':merge' for b (binary False symlink False changedelete False)
merging a and b to b merging a and b to b
my b@add3f11052fa+ other b@17c05bb7fcb6 ancestor a@b8bf91eeebbc my b@add3f11052fa+ other b@17c05bb7fcb6 ancestor a@b8bf91eeebbc
premerge successful premerge successful
c: remote moved from a -> m (premerge) c: remote moved from a -> m (premerge)
picked tool ':merge' for c (binary False symlink False changedelete False) picked tool ':merge' for c (binary False symlink False changedelete False)
merging a and c to c merging a and c to c

tests/test-double-merge.t

bar bar
all copies found (* = to merge, ! = divergent, % = renamed and deleted): all copies found (* = to merge, ! = divergent, % = renamed and deleted):
on remote side: on remote side:
src: 'foo' -> dst: 'bar' * src: 'foo' -> dst: 'bar' *
checking for directory renames checking for directory renames
resolving manifests resolving manifests
branchmerge: True, force: False, partial: False branchmerge: True, force: False, partial: False
ancestor: e6dc8efe11cc, local: 6a0df1dad128+, remote: 484bf6903104 ancestor: e6dc8efe11cc, local: 6a0df1dad128+, remote: 484bf6903104
starting 4 threads for background file closing (?)
preserving foo for resolve of bar preserving foo for resolve of bar
preserving foo for resolve of foo preserving foo for resolve of foo
starting 4 threads for background file closing (?)
bar: remote copied from foo -> m (premerge) bar: remote copied from foo -> m (premerge)
picked tool ':merge' for bar (binary False symlink False changedelete False) picked tool ':merge' for bar (binary False symlink False changedelete False)
merging foo and bar to bar merging foo and bar to bar
my bar@6a0df1dad128+ other bar@484bf6903104 ancestor foo@e6dc8efe11cc my bar@6a0df1dad128+ other bar@484bf6903104 ancestor foo@e6dc8efe11cc
premerge successful premerge successful
foo: versions differ -> m (premerge) foo: versions differ -> m (premerge)
picked tool ':merge' for foo (binary False symlink False changedelete False) picked tool ':merge' for foo (binary False symlink False changedelete False)
merging foo merging foo

tests/test-graft.t

b b
all copies found (* = to merge, ! = divergent, % = renamed and deleted): all copies found (* = to merge, ! = divergent, % = renamed and deleted):
on local side: on local side:
src: 'a' -> dst: 'b' * src: 'a' -> dst: 'b' *
checking for directory renames checking for directory renames
resolving manifests resolving manifests
branchmerge: True, force: True, partial: False branchmerge: True, force: True, partial: False
ancestor: 68795b066622, local: ef0ef43d49e7+, remote: 5d205f8b35b6 ancestor: 68795b066622, local: ef0ef43d49e7+, remote: 5d205f8b35b6
preserving b for resolve of b
starting 4 threads for background file closing (?) starting 4 threads for background file closing (?)
preserving b for resolve of b
b: local copied/moved from a -> m (premerge) b: local copied/moved from a -> m (premerge)
picked tool ':merge' for b (binary False symlink False changedelete False) picked tool ':merge' for b (binary False symlink False changedelete False)
merging b and a to b merging b and a to b
my b@ef0ef43d49e7+ other a@5d205f8b35b6 ancestor a@68795b066622 my b@ef0ef43d49e7+ other a@5d205f8b35b6 ancestor a@68795b066622
premerge successful premerge successful
committing files: committing files:
b b
committing manifest committing manifest

tests/test-issue672.t

1a 1a
all copies found (* = to merge, ! = divergent, % = renamed and deleted): all copies found (* = to merge, ! = divergent, % = renamed and deleted):
on local side: on local side:
src: '1' -> dst: '1a' * src: '1' -> dst: '1a' *
checking for directory renames checking for directory renames
resolving manifests resolving manifests
branchmerge: True, force: False, partial: False branchmerge: True, force: False, partial: False
ancestor: c64f439569a9, local: f4a9cff3cd0b+, remote: 746e9549ea96 ancestor: c64f439569a9, local: f4a9cff3cd0b+, remote: 746e9549ea96
preserving 1a for resolve of 1a
starting 4 threads for background file closing (?) starting 4 threads for background file closing (?)
preserving 1a for resolve of 1a
1a: local copied/moved from 1 -> m (premerge) 1a: local copied/moved from 1 -> m (premerge)
picked tool ':merge' for 1a (binary False symlink False changedelete False) picked tool ':merge' for 1a (binary False symlink False changedelete False)
merging 1a and 1 to 1a merging 1a and 1 to 1a
my 1a@f4a9cff3cd0b+ other 1@746e9549ea96 ancestor 1@c64f439569a9 my 1a@f4a9cff3cd0b+ other 1@746e9549ea96 ancestor 1@c64f439569a9
premerge successful premerge successful
0 files updated, 1 files merged, 0 files removed, 0 files unresolved 0 files updated, 1 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit) (branch merge, don't forget to commit)
$ hg co -C 4 $ hg co -C 4
1 files updated, 0 files merged, 1 files removed, 0 files unresolved 1 files updated, 0 files merged, 1 files removed, 0 files unresolved
$ hg merge -y --debug 3 $ hg merge -y --debug 3
unmatched files in other: unmatched files in other:
1a 1a
all copies found (* = to merge, ! = divergent, % = renamed and deleted): all copies found (* = to merge, ! = divergent, % = renamed and deleted):
on remote side: on remote side:
src: '1' -> dst: '1a' * src: '1' -> dst: '1a' *
checking for directory renames checking for directory renames
resolving manifests resolving manifests
branchmerge: True, force: False, partial: False branchmerge: True, force: False, partial: False
ancestor: c64f439569a9, local: 746e9549ea96+, remote: f4a9cff3cd0b ancestor: c64f439569a9, local: 746e9549ea96+, remote: f4a9cff3cd0b
starting 4 threads for background file closing (?)
preserving 1 for resolve of 1a preserving 1 for resolve of 1a
removing 1 removing 1
starting 4 threads for background file closing (?)
1a: remote moved from 1 -> m (premerge) 1a: remote moved from 1 -> m (premerge)
picked tool ':merge' for 1a (binary False symlink False changedelete False) picked tool ':merge' for 1a (binary False symlink False changedelete False)
merging 1 and 1a to 1a merging 1 and 1a to 1a
my 1a@746e9549ea96+ other 1a@f4a9cff3cd0b ancestor 1@c64f439569a9 my 1a@746e9549ea96+ other 1a@f4a9cff3cd0b ancestor 1@c64f439569a9
premerge successful premerge successful
0 files updated, 1 files merged, 0 files removed, 0 files unresolved 0 files updated, 1 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit) (branch merge, don't forget to commit)

tests/test-merge-commit.t

0:2665aaee66e9 0:2665aaee66e9
This should use bar@rev2 as the ancestor: This should use bar@rev2 as the ancestor:
$ hg --debug merge 3 $ hg --debug merge 3
resolving manifests resolving manifests
branchmerge: True, force: False, partial: False branchmerge: True, force: False, partial: False
ancestor: 0f2ff26688b9, local: 2263c1be0967+, remote: 0555950ead28 ancestor: 0f2ff26688b9, local: 2263c1be0967+, remote: 0555950ead28
preserving bar for resolve of bar
starting 4 threads for background file closing (?) starting 4 threads for background file closing (?)
preserving bar for resolve of bar
bar: versions differ -> m (premerge) bar: versions differ -> m (premerge)
picked tool ':merge' for bar (binary False symlink False changedelete False) picked tool ':merge' for bar (binary False symlink False changedelete False)
merging bar merging bar
my bar@2263c1be0967+ other bar@0555950ead28 ancestor bar@0f2ff26688b9 my bar@2263c1be0967+ other bar@0555950ead28 ancestor bar@0f2ff26688b9
premerge successful premerge successful
0 files updated, 1 files merged, 0 files removed, 0 files unresolved 0 files updated, 1 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit) (branch merge, don't forget to commit)
0:2665aaee66e9 0:2665aaee66e9
This should use bar@rev2 as the ancestor: This should use bar@rev2 as the ancestor:
$ hg --debug merge 3 $ hg --debug merge 3
resolving manifests resolving manifests
branchmerge: True, force: False, partial: False branchmerge: True, force: False, partial: False
ancestor: 0f2ff26688b9, local: 2263c1be0967+, remote: 3ffa6b9e35f0 ancestor: 0f2ff26688b9, local: 2263c1be0967+, remote: 3ffa6b9e35f0
preserving bar for resolve of bar
starting 4 threads for background file closing (?) starting 4 threads for background file closing (?)
preserving bar for resolve of bar
bar: versions differ -> m (premerge) bar: versions differ -> m (premerge)
picked tool ':merge' for bar (binary False symlink False changedelete False) picked tool ':merge' for bar (binary False symlink False changedelete False)
merging bar merging bar
my bar@2263c1be0967+ other bar@3ffa6b9e35f0 ancestor bar@0f2ff26688b9 my bar@2263c1be0967+ other bar@3ffa6b9e35f0 ancestor bar@0f2ff26688b9
premerge successful premerge successful
0 files updated, 1 files merged, 0 files removed, 0 files unresolved 0 files updated, 1 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit) (branch merge, don't forget to commit)

tests/test-merge7.t

adding file changes adding file changes
added 1 changesets with 1 changes to 1 files (+1 heads) added 1 changesets with 1 changes to 1 files (+1 heads)
new changesets 40d11a4173a8 new changesets 40d11a4173a8
(run 'hg heads' to see heads, 'hg merge' to merge) (run 'hg heads' to see heads, 'hg merge' to merge)
$ hg merge --debug $ hg merge --debug
resolving manifests resolving manifests
branchmerge: True, force: False, partial: False branchmerge: True, force: False, partial: False
ancestor: 96b70246a118, local: 50c3a7e29886+, remote: 40d11a4173a8 ancestor: 96b70246a118, local: 50c3a7e29886+, remote: 40d11a4173a8
preserving test.txt for resolve of test.txt
starting 4 threads for background file closing (?) starting 4 threads for background file closing (?)
preserving test.txt for resolve of test.txt
test.txt: versions differ -> m (premerge) test.txt: versions differ -> m (premerge)
picked tool ':merge' for test.txt (binary False symlink False changedelete False) picked tool ':merge' for test.txt (binary False symlink False changedelete False)
merging test.txt merging test.txt
my test.txt@50c3a7e29886+ other test.txt@40d11a4173a8 ancestor test.txt@96b70246a118 my test.txt@50c3a7e29886+ other test.txt@40d11a4173a8 ancestor test.txt@96b70246a118
test.txt: versions differ -> m (merge) test.txt: versions differ -> m (merge)
picked tool ':merge' for test.txt (binary False symlink False changedelete False) picked tool ':merge' for test.txt (binary False symlink False changedelete False)
my test.txt@50c3a7e29886+ other test.txt@40d11a4173a8 ancestor test.txt@96b70246a118 my test.txt@50c3a7e29886+ other test.txt@40d11a4173a8 ancestor test.txt@96b70246a118
warning: conflicts while merging test.txt! (edit, then use 'hg resolve --mark') warning: conflicts while merging test.txt! (edit, then use 'hg resolve --mark')

tests/test-rename-merge1.t

on local side: on local side:
src: 'y' -> dst: 'z' * src: 'y' -> dst: 'z' *
on remote side: on remote side:
src: 'x' -> dst: 'z' * src: 'x' -> dst: 'z' *
checking for directory renames checking for directory renames
resolving manifests resolving manifests
branchmerge: True, force: False, partial: False branchmerge: True, force: False, partial: False
ancestor: 5151c134577e, local: 07fcbc9a74ed+, remote: f21419739508 ancestor: 5151c134577e, local: 07fcbc9a74ed+, remote: f21419739508
preserving z for resolve of z
starting 4 threads for background file closing (?) starting 4 threads for background file closing (?)
preserving z for resolve of z
z: both renamed from y -> m (premerge) z: both renamed from y -> m (premerge)
picked tool ':merge3' for z (binary False symlink False changedelete False) picked tool ':merge3' for z (binary False symlink False changedelete False)
merging z merging z
my z@07fcbc9a74ed+ other z@f21419739508 ancestor y@5151c134577e my z@07fcbc9a74ed+ other z@f21419739508 ancestor y@5151c134577e
premerge successful premerge successful
0 files updated, 1 files merged, 0 files removed, 0 files unresolved 0 files updated, 1 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit) (branch merge, don't forget to commit)
$ ls $ ls
x x
z z
$ cat x $ cat x
x x
foo foo
# 'z' should have had the added 'foo' line # 'z' should have had the added 'foo' line
$ cat z $ cat z
x x

tests/test-rename-merge2.t

b b
all copies found (* = to merge, ! = divergent, % = renamed and deleted): all copies found (* = to merge, ! = divergent, % = renamed and deleted):
on remote side: on remote side:
src: 'a' -> dst: 'b' * src: 'a' -> dst: 'b' *
checking for directory renames checking for directory renames
resolving manifests resolving manifests
branchmerge: True, force: False, partial: False branchmerge: True, force: False, partial: False
ancestor: 924404dff337, local: e300d1c794ec+, remote: 4ce40f5aca24 ancestor: 924404dff337, local: e300d1c794ec+, remote: 4ce40f5aca24
starting 4 threads for background file closing (?)
preserving a for resolve of b preserving a for resolve of b
preserving rev for resolve of rev preserving rev for resolve of rev
starting 4 threads for background file closing (?)
b: remote copied from a -> m (premerge) 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) picked tool '* ../merge' for b (binary False symlink False changedelete False) (glob)
merging a and b to b merging a and b to b
my b@e300d1c794ec+ other b@4ce40f5aca24 ancestor a@924404dff337 my b@e300d1c794ec+ other b@4ce40f5aca24 ancestor a@924404dff337
premerge successful premerge successful
rev: versions differ -> m (premerge) rev: versions differ -> m (premerge)
picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob) picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob)
merging rev merging rev
my rev@e300d1c794ec+ other rev@4ce40f5aca24 ancestor rev@924404dff337 my rev@e300d1c794ec+ other rev@4ce40f5aca24 ancestor rev@924404dff337
b b
all copies found (* = to merge, ! = divergent, % = renamed and deleted): all copies found (* = to merge, ! = divergent, % = renamed and deleted):
on remote side: on remote side:
src: 'a' -> dst: 'b' * src: 'a' -> dst: 'b' *
checking for directory renames checking for directory renames
resolving manifests resolving manifests
branchmerge: True, force: False, partial: False branchmerge: True, force: False, partial: False
ancestor: 924404dff337, local: e300d1c794ec+, remote: bdb19105162a ancestor: 924404dff337, local: e300d1c794ec+, remote: bdb19105162a
starting 4 threads for background file closing (?)
preserving a for resolve of b preserving a for resolve of b
preserving rev for resolve of rev preserving rev for resolve of rev
removing a removing a
starting 4 threads for background file closing (?)
b: remote moved from a -> m (premerge) b: remote moved from a -> m (premerge)
picked tool '* ../merge' for b (binary False symlink False changedelete False) (glob) picked tool '* ../merge' for b (binary False symlink False changedelete False) (glob)
merging a and b to b merging a and b to b
my b@e300d1c794ec+ other b@bdb19105162a ancestor a@924404dff337 my b@e300d1c794ec+ other b@bdb19105162a ancestor a@924404dff337
premerge successful premerge successful
rev: versions differ -> m (premerge) rev: versions differ -> m (premerge)
picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob) picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob)
merging rev merging rev
b b
all copies found (* = to merge, ! = divergent, % = renamed and deleted): all copies found (* = to merge, ! = divergent, % = renamed and deleted):
on local side: on local side:
src: 'a' -> dst: 'b' * src: 'a' -> dst: 'b' *
checking for directory renames checking for directory renames
resolving manifests resolving manifests
branchmerge: True, force: False, partial: False branchmerge: True, force: False, partial: False
ancestor: 924404dff337, local: 02963e448370+, remote: f4db7e329e71 ancestor: 924404dff337, local: 02963e448370+, remote: f4db7e329e71
starting 4 threads for background file closing (?)
preserving b for resolve of b preserving b for resolve of b
preserving rev for resolve of rev preserving rev for resolve of rev
starting 4 threads for background file closing (?)
b: local copied/moved from a -> m (premerge) b: local copied/moved from a -> m (premerge)
picked tool '* ../merge' for b (binary False symlink False changedelete False) (glob) picked tool '* ../merge' for b (binary False symlink False changedelete False) (glob)
merging b and a to b merging b and a to b
my b@02963e448370+ other a@f4db7e329e71 ancestor a@924404dff337 my b@02963e448370+ other a@f4db7e329e71 ancestor a@924404dff337
premerge successful premerge successful
rev: versions differ -> m (premerge) rev: versions differ -> m (premerge)
picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob) picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob)
merging rev merging rev
b b
all copies found (* = to merge, ! = divergent, % = renamed and deleted): all copies found (* = to merge, ! = divergent, % = renamed and deleted):
on local side: on local side:
src: 'a' -> dst: 'b' src: 'a' -> dst: 'b'
checking for directory renames checking for directory renames
resolving manifests resolving manifests
branchmerge: True, force: False, partial: False branchmerge: True, force: False, partial: False
ancestor: 924404dff337, local: 86a2aa42fc76+, remote: 97c705ade336 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 (?)
preserving rev for resolve of rev
rev: versions differ -> m (premerge) rev: versions differ -> m (premerge)
picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob) picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob)
merging rev merging rev
my rev@86a2aa42fc76+ other rev@97c705ade336 ancestor rev@924404dff337 my rev@86a2aa42fc76+ other rev@97c705ade336 ancestor rev@924404dff337
rev: versions differ -> m (merge) rev: versions differ -> m (merge)
picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob) picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob)
my rev@86a2aa42fc76+ other rev@97c705ade336 ancestor rev@924404dff337 my rev@86a2aa42fc76+ other rev@97c705ade336 ancestor rev@924404dff337
launching merge tool: * ../merge *$TESTTMP/t/t/rev* * * (glob) launching merge tool: * ../merge *$TESTTMP/t/t/rev* * * (glob)
b b
all copies found (* = to merge, ! = divergent, % = renamed and deleted): all copies found (* = to merge, ! = divergent, % = renamed and deleted):
on local side: on local side:
src: 'a' -> dst: 'b' src: 'a' -> dst: 'b'
checking for directory renames checking for directory renames
resolving manifests resolving manifests
branchmerge: True, force: False, partial: False branchmerge: True, force: False, partial: False
ancestor: 924404dff337, local: 02963e448370+, remote: 97c705ade336 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 (?)
preserving rev for resolve of rev
rev: versions differ -> m (premerge) rev: versions differ -> m (premerge)
picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob) picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob)
merging rev merging rev
my rev@02963e448370+ other rev@97c705ade336 ancestor rev@924404dff337 my rev@02963e448370+ other rev@97c705ade336 ancestor rev@924404dff337
rev: versions differ -> m (merge) rev: versions differ -> m (merge)
picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob) picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob)
my rev@02963e448370+ other rev@97c705ade336 ancestor rev@924404dff337 my rev@02963e448370+ other rev@97c705ade336 ancestor rev@924404dff337
launching merge tool: * ../merge *$TESTTMP/t/t/rev* * * (glob) launching merge tool: * ../merge *$TESTTMP/t/t/rev* * * (glob)
on local side: on local side:
src: 'a' -> dst: 'b' * src: 'a' -> dst: 'b' *
on remote side: on remote side:
src: 'a' -> dst: 'b' * src: 'a' -> dst: 'b' *
checking for directory renames checking for directory renames
resolving manifests resolving manifests
branchmerge: True, force: False, partial: False branchmerge: True, force: False, partial: False
ancestor: 924404dff337, local: 62e7bf090eba+, remote: 49b6d8032493 ancestor: 924404dff337, local: 62e7bf090eba+, remote: 49b6d8032493
starting 4 threads for background file closing (?)
preserving b for resolve of b preserving b for resolve of b
preserving rev for resolve of rev preserving rev for resolve of rev
starting 4 threads for background file closing (?)
b: both renamed from a -> m (premerge) b: both renamed from a -> m (premerge)
picked tool '* ../merge' for b (binary False symlink False changedelete False) (glob) picked tool '* ../merge' for b (binary False symlink False changedelete False) (glob)
merging b merging b
my b@62e7bf090eba+ other b@49b6d8032493 ancestor a@924404dff337 my b@62e7bf090eba+ other b@49b6d8032493 ancestor a@924404dff337
rev: versions differ -> m (premerge) rev: versions differ -> m (premerge)
picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob) picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob)
merging rev merging rev
my rev@62e7bf090eba+ other rev@49b6d8032493 ancestor rev@924404dff337 my rev@62e7bf090eba+ other rev@49b6d8032493 ancestor rev@924404dff337
-------------- --------------
all copies found (* = to merge, ! = divergent, % = renamed and deleted): all copies found (* = to merge, ! = divergent, % = renamed and deleted):
on local side: on local side:
src: 'a' -> dst: 'b' src: 'a' -> dst: 'b'
checking for directory renames checking for directory renames
resolving manifests resolving manifests
branchmerge: True, force: False, partial: False branchmerge: True, force: False, partial: False
ancestor: 924404dff337, local: 86a2aa42fc76+, remote: af30c7647fc7 ancestor: 924404dff337, local: 86a2aa42fc76+, remote: af30c7647fc7
starting 4 threads for background file closing (?)
preserving b for resolve of b preserving b for resolve of b
preserving rev for resolve of rev preserving rev for resolve of rev
starting 4 threads for background file closing (?)
b: both created -> m (premerge) b: both created -> m (premerge)
picked tool '* ../merge' for b (binary False symlink False changedelete False) (glob) picked tool '* ../merge' for b (binary False symlink False changedelete False) (glob)
merging b merging b
my b@86a2aa42fc76+ other b@af30c7647fc7 ancestor b@000000000000 my b@86a2aa42fc76+ other b@af30c7647fc7 ancestor b@000000000000
rev: versions differ -> m (premerge) rev: versions differ -> m (premerge)
picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob) picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob)
merging rev merging rev
my rev@86a2aa42fc76+ other rev@af30c7647fc7 ancestor rev@924404dff337 my rev@86a2aa42fc76+ other rev@af30c7647fc7 ancestor rev@924404dff337
on remote side: on remote side:
src: 'a' -> dst: 'b' src: 'a' -> dst: 'b'
checking for directory renames checking for directory renames
resolving manifests resolving manifests
branchmerge: True, force: False, partial: False branchmerge: True, force: False, partial: False
ancestor: 924404dff337, local: 59318016310c+, remote: bdb19105162a ancestor: 924404dff337, local: 59318016310c+, remote: bdb19105162a
a: other deleted -> r a: other deleted -> r
removing a removing a
starting 4 threads for background file closing (?)
preserving b for resolve of b preserving b for resolve of b
preserving rev for resolve of rev preserving rev for resolve of rev
starting 4 threads for background file closing (?)
b: both created -> m (premerge) b: both created -> m (premerge)
picked tool '* ../merge' for b (binary False symlink False changedelete False) (glob) picked tool '* ../merge' for b (binary False symlink False changedelete False) (glob)
merging b merging b
my b@59318016310c+ other b@bdb19105162a ancestor b@000000000000 my b@59318016310c+ other b@bdb19105162a ancestor b@000000000000
rev: versions differ -> m (premerge) rev: versions differ -> m (premerge)
picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob) picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob)
merging rev merging rev
my rev@59318016310c+ other rev@bdb19105162a ancestor rev@924404dff337 my rev@59318016310c+ other rev@bdb19105162a ancestor rev@924404dff337
on remote side: on remote side:
src: 'a' -> dst: 'b' src: 'a' -> dst: 'b'
checking for directory renames checking for directory renames
resolving manifests resolving manifests
branchmerge: True, force: False, partial: False branchmerge: True, force: False, partial: False
ancestor: 924404dff337, local: 59318016310c+, remote: bdb19105162a ancestor: 924404dff337, local: 59318016310c+, remote: bdb19105162a
a: other deleted -> r a: other deleted -> r
removing a removing a
starting 4 threads for background file closing (?)
preserving b for resolve of b preserving b for resolve of b
preserving rev for resolve of rev preserving rev for resolve of rev
starting 4 threads for background file closing (?)
b: both created -> m (premerge) b: both created -> m (premerge)
picked tool '* ../merge' for b (binary False symlink False changedelete False) (glob) picked tool '* ../merge' for b (binary False symlink False changedelete False) (glob)
merging b merging b
my b@59318016310c+ other b@bdb19105162a ancestor b@000000000000 my b@59318016310c+ other b@bdb19105162a ancestor b@000000000000
rev: versions differ -> m (premerge) rev: versions differ -> m (premerge)
picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob) picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob)
merging rev merging rev
my rev@59318016310c+ other rev@bdb19105162a ancestor rev@924404dff337 my rev@59318016310c+ other rev@bdb19105162a ancestor rev@924404dff337
-------------- --------------
all copies found (* = to merge, ! = divergent, % = renamed and deleted): all copies found (* = to merge, ! = divergent, % = renamed and deleted):
on remote side: on remote side:
src: 'a' -> dst: 'b' * src: 'a' -> dst: 'b' *
checking for directory renames checking for directory renames
resolving manifests resolving manifests
branchmerge: True, force: False, partial: False branchmerge: True, force: False, partial: False
ancestor: 924404dff337, local: 0b76e65c8289+, remote: 4ce40f5aca24 ancestor: 924404dff337, local: 0b76e65c8289+, remote: 4ce40f5aca24
starting 4 threads for background file closing (?)
preserving b for resolve of b preserving b for resolve of b
preserving rev for resolve of rev preserving rev for resolve of rev
starting 4 threads for background file closing (?)
b: both renamed from a -> m (premerge) 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) picked tool '* ../merge' for b (binary False symlink False changedelete False) (glob)
merging b merging b
my b@0b76e65c8289+ other b@4ce40f5aca24 ancestor a@924404dff337 my b@0b76e65c8289+ other b@4ce40f5aca24 ancestor a@924404dff337
premerge successful premerge successful
rev: versions differ -> m (premerge) rev: versions differ -> m (premerge)
picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob) picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob)
merging rev merging rev
my rev@0b76e65c8289+ other rev@4ce40f5aca24 ancestor rev@924404dff337 my rev@0b76e65c8289+ other rev@4ce40f5aca24 ancestor rev@924404dff337
-------------- --------------
all copies found (* = to merge, ! = divergent, % = renamed and deleted): all copies found (* = to merge, ! = divergent, % = renamed and deleted):
on local side: on local side:
src: 'a' -> dst: 'b' * src: 'a' -> dst: 'b' *
checking for directory renames checking for directory renames
resolving manifests resolving manifests
branchmerge: True, force: False, partial: False branchmerge: True, force: False, partial: False
ancestor: 924404dff337, local: 02963e448370+, remote: 8dbce441892a ancestor: 924404dff337, local: 02963e448370+, remote: 8dbce441892a
starting 4 threads for background file closing (?)
preserving b for resolve of b preserving b for resolve of b
preserving rev for resolve of rev preserving rev for resolve of rev
starting 4 threads for background file closing (?)
b: both renamed from a -> m (premerge) b: both renamed from a -> m (premerge)
picked tool '* ../merge' for b (binary False symlink False changedelete False) (glob) picked tool '* ../merge' for b (binary False symlink False changedelete False) (glob)
merging b merging b
my b@02963e448370+ other b@8dbce441892a ancestor a@924404dff337 my b@02963e448370+ other b@8dbce441892a ancestor a@924404dff337
premerge successful premerge successful
rev: versions differ -> m (premerge) rev: versions differ -> m (premerge)
picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob) picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob)
merging rev merging rev
-------------- --------------
all copies found (* = to merge, ! = divergent, % = renamed and deleted): all copies found (* = to merge, ! = divergent, % = renamed and deleted):
on remote side: on remote side:
src: 'a' -> dst: 'b' * src: 'a' -> dst: 'b' *
checking for directory renames checking for directory renames
resolving manifests resolving manifests
branchmerge: True, force: False, partial: False branchmerge: True, force: False, partial: False
ancestor: 924404dff337, local: 0b76e65c8289+, remote: bdb19105162a ancestor: 924404dff337, local: 0b76e65c8289+, remote: bdb19105162a
starting 4 threads for background file closing (?)
preserving b for resolve of b preserving b for resolve of b
preserving rev for resolve of rev preserving rev for resolve of rev
starting 4 threads for background file closing (?)
b: both renamed from a -> m (premerge) b: both renamed from a -> m (premerge)
picked tool '* ../merge' for b (binary False symlink False changedelete False) (glob) picked tool '* ../merge' for b (binary False symlink False changedelete False) (glob)
merging b merging b
my b@0b76e65c8289+ other b@bdb19105162a ancestor a@924404dff337 my b@0b76e65c8289+ other b@bdb19105162a ancestor a@924404dff337
premerge successful premerge successful
rev: versions differ -> m (premerge) rev: versions differ -> m (premerge)
picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob) picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob)
merging rev merging rev
b b
all copies found (* = to merge, ! = divergent, % = renamed and deleted): all copies found (* = to merge, ! = divergent, % = renamed and deleted):
on remote side: on remote side:
src: 'a' -> dst: 'b' * src: 'a' -> dst: 'b' *
checking for directory renames checking for directory renames
resolving manifests resolving manifests
branchmerge: True, force: False, partial: False branchmerge: True, force: False, partial: False
ancestor: 924404dff337, local: e300d1c794ec+, remote: 49b6d8032493 ancestor: 924404dff337, local: e300d1c794ec+, remote: 49b6d8032493
starting 4 threads for background file closing (?)
preserving a for resolve of b preserving a for resolve of b
preserving rev for resolve of rev preserving rev for resolve of rev
removing a removing a
starting 4 threads for background file closing (?)
b: remote moved from a -> m (premerge) b: remote moved from a -> m (premerge)
picked tool '* ../merge' for b (binary False symlink False changedelete False) (glob) picked tool '* ../merge' for b (binary False symlink False changedelete False) (glob)
merging a and b to b merging a and b to b
my b@e300d1c794ec+ other b@49b6d8032493 ancestor a@924404dff337 my b@e300d1c794ec+ other b@49b6d8032493 ancestor a@924404dff337
rev: versions differ -> m (premerge) rev: versions differ -> m (premerge)
picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob) picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob)
merging rev merging rev
my rev@e300d1c794ec+ other rev@49b6d8032493 ancestor rev@924404dff337 my rev@e300d1c794ec+ other rev@49b6d8032493 ancestor rev@924404dff337
b b
all copies found (* = to merge, ! = divergent, % = renamed and deleted): all copies found (* = to merge, ! = divergent, % = renamed and deleted):
on local side: on local side:
src: 'a' -> dst: 'b' * src: 'a' -> dst: 'b' *
checking for directory renames checking for directory renames
resolving manifests resolving manifests
branchmerge: True, force: False, partial: False branchmerge: True, force: False, partial: False
ancestor: 924404dff337, local: 62e7bf090eba+, remote: f4db7e329e71 ancestor: 924404dff337, local: 62e7bf090eba+, remote: f4db7e329e71
starting 4 threads for background file closing (?)
preserving b for resolve of b preserving b for resolve of b
preserving rev for resolve of rev preserving rev for resolve of rev
starting 4 threads for background file closing (?)
b: local copied/moved from a -> m (premerge) b: local copied/moved from a -> m (premerge)
picked tool '* ../merge' for b (binary False symlink False changedelete False) (glob) picked tool '* ../merge' for b (binary False symlink False changedelete False) (glob)
merging b and a to b merging b and a to b
my b@62e7bf090eba+ other a@f4db7e329e71 ancestor a@924404dff337 my b@62e7bf090eba+ other a@f4db7e329e71 ancestor a@924404dff337
rev: versions differ -> m (premerge) rev: versions differ -> m (premerge)
picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob) picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob)
merging rev merging rev
my rev@62e7bf090eba+ other rev@f4db7e329e71 ancestor rev@924404dff337 my rev@62e7bf090eba+ other rev@f4db7e329e71 ancestor rev@924404dff337

tests/test-subrepo.t

subrepository t diverged (local revision: 20a0db6fbf6c, remote revision: 7af322bc1198) subrepository t diverged (local revision: 20a0db6fbf6c, remote revision: 7af322bc1198)
starting 4 threads for background file closing (?) starting 4 threads for background file closing (?)
you can (m)erge, keep (l)ocal [working copy] or keep (r)emote [merge rev]. you can (m)erge, keep (l)ocal [working copy] or keep (r)emote [merge rev].
what do you want to do? m what do you want to do? m
merging subrepository "t" merging subrepository "t"
resolving manifests resolving manifests
branchmerge: True, force: False, partial: False branchmerge: True, force: False, partial: False
ancestor: 6747d179aa9a, local: 20a0db6fbf6c+, remote: 7af322bc1198 ancestor: 6747d179aa9a, local: 20a0db6fbf6c+, remote: 7af322bc1198
preserving t for resolve of t
starting 4 threads for background file closing (?) starting 4 threads for background file closing (?)
preserving t for resolve of t
t: versions differ -> m (premerge) t: versions differ -> m (premerge)
picked tool ':merge' for t (binary False symlink False changedelete False) picked tool ':merge' for t (binary False symlink False changedelete False)
merging t merging t
my t@20a0db6fbf6c+ other t@7af322bc1198 ancestor t@6747d179aa9a my t@20a0db6fbf6c+ other t@7af322bc1198 ancestor t@6747d179aa9a
t: versions differ -> m (merge) t: versions differ -> m (merge)
picked tool ':merge' for t (binary False symlink False changedelete False) picked tool ':merge' for t (binary False symlink False changedelete False)
my t@20a0db6fbf6c+ other t@7af322bc1198 ancestor t@6747d179aa9a my t@20a0db6fbf6c+ other t@7af322bc1198 ancestor t@6747d179aa9a
warning: conflicts while merging t! (edit, then use 'hg resolve --mark') warning: conflicts while merging t! (edit, then use 'hg resolve --mark')

tests/test-up-local-change.t

$ hg --debug up 0 $ hg --debug up 0
starting 4 threads for background file closing (?) starting 4 threads for background file closing (?)
resolving manifests resolving manifests
branchmerge: False, force: False, partial: False branchmerge: False, force: False, partial: False
ancestor: 1e71731e6fbb, local: 1e71731e6fbb+, remote: c19d34741b0a ancestor: 1e71731e6fbb, local: 1e71731e6fbb+, remote: c19d34741b0a
b: other deleted -> r b: other deleted -> r
removing b removing b
preserving a for resolve of a
starting 4 threads for background file closing (?) starting 4 threads for background file closing (?)
preserving a for resolve of a
a: versions differ -> m (premerge) a: versions differ -> m (premerge)
picked tool 'true' for a (binary False symlink False changedelete False) picked tool 'true' for a (binary False symlink False changedelete False)
merging a merging a
my a@1e71731e6fbb+ other a@c19d34741b0a ancestor a@1e71731e6fbb my a@1e71731e6fbb+ other a@c19d34741b0a ancestor a@1e71731e6fbb
a: versions differ -> m (merge) a: versions differ -> m (merge)
picked tool 'true' for a (binary False symlink False changedelete False) picked tool 'true' for a (binary False symlink False changedelete False)
my a@1e71731e6fbb+ other a@c19d34741b0a ancestor a@1e71731e6fbb my a@1e71731e6fbb+ other a@c19d34741b0a ancestor a@1e71731e6fbb
launching merge tool: true *$TESTTMP/r2/a* * * (glob) launching merge tool: true *$TESTTMP/r2/a* * * (glob)