44 branchmerge: False, force: False, partial: False |
44 branchmerge: False, force: False, partial: False |
45 ancestor: c19d34741b0a, local: c19d34741b0a+, remote: 1e71731e6fbb |
45 ancestor: c19d34741b0a, local: c19d34741b0a+, remote: 1e71731e6fbb |
46 b: remote created -> g |
46 b: remote created -> g |
47 getting b |
47 getting b |
48 preserving a for resolve of a |
48 preserving a for resolve of a |
49 a: versions differ -> m (premerge) |
49 a: versions differ -> m |
50 picked tool 'true' for a (binary False symlink False changedelete False) |
50 picked tool 'true' for a (binary False symlink False changedelete False) |
51 merging a |
51 merging a |
52 my a@c19d34741b0a+ other a@1e71731e6fbb ancestor a@c19d34741b0a |
52 my a@c19d34741b0a+ other a@1e71731e6fbb ancestor a@c19d34741b0a |
53 a: versions differ -> m (merge) |
|
54 picked tool 'true' for a (binary False symlink False changedelete False) |
53 picked tool 'true' for a (binary False symlink False changedelete False) |
55 my a@c19d34741b0a+ other a@1e71731e6fbb ancestor a@c19d34741b0a |
54 my a@c19d34741b0a+ other a@1e71731e6fbb ancestor a@c19d34741b0a |
56 launching merge tool: true *$TESTTMP/r2/a* * * (glob) |
55 launching merge tool: true *$TESTTMP/r2/a* * * (glob) |
57 merge tool returned: 0 |
56 merge tool returned: 0 |
58 1 files updated, 1 files merged, 0 files removed, 0 files unresolved |
57 1 files updated, 1 files merged, 0 files removed, 0 files unresolved |
70 ancestor: 1e71731e6fbb, local: 1e71731e6fbb+, remote: c19d34741b0a |
69 ancestor: 1e71731e6fbb, local: 1e71731e6fbb+, remote: c19d34741b0a |
71 b: other deleted -> r |
70 b: other deleted -> r |
72 removing b |
71 removing b |
73 starting 4 threads for background file closing (?) |
72 starting 4 threads for background file closing (?) |
74 preserving a for resolve of a |
73 preserving a for resolve of a |
75 a: versions differ -> m (premerge) |
74 a: versions differ -> m |
76 picked tool 'true' for a (binary False symlink False changedelete False) |
75 picked tool 'true' for a (binary False symlink False changedelete False) |
77 merging a |
76 merging a |
78 my a@1e71731e6fbb+ other a@c19d34741b0a ancestor a@1e71731e6fbb |
77 my a@1e71731e6fbb+ other a@c19d34741b0a ancestor a@1e71731e6fbb |
79 a: versions differ -> m (merge) |
|
80 picked tool 'true' for a (binary False symlink False changedelete False) |
78 picked tool 'true' for a (binary False symlink False changedelete False) |
81 my a@1e71731e6fbb+ other a@c19d34741b0a ancestor a@1e71731e6fbb |
79 my a@1e71731e6fbb+ other a@c19d34741b0a ancestor a@1e71731e6fbb |
82 launching merge tool: true *$TESTTMP/r2/a* * * (glob) |
80 launching merge tool: true *$TESTTMP/r2/a* * * (glob) |
83 merge tool returned: 0 |
81 merge tool returned: 0 |
84 0 files updated, 1 files merged, 1 files removed, 0 files unresolved |
82 0 files updated, 1 files merged, 1 files removed, 0 files unresolved |
93 branchmerge: False, force: False, partial: False |
91 branchmerge: False, force: False, partial: False |
94 ancestor: c19d34741b0a, local: c19d34741b0a+, remote: 1e71731e6fbb |
92 ancestor: c19d34741b0a, local: c19d34741b0a+, remote: 1e71731e6fbb |
95 b: remote created -> g |
93 b: remote created -> g |
96 getting b |
94 getting b |
97 preserving a for resolve of a |
95 preserving a for resolve of a |
98 a: versions differ -> m (premerge) |
96 a: versions differ -> m |
99 picked tool 'true' for a (binary False symlink False changedelete False) |
97 picked tool 'true' for a (binary False symlink False changedelete False) |
100 merging a |
98 merging a |
101 my a@c19d34741b0a+ other a@1e71731e6fbb ancestor a@c19d34741b0a |
99 my a@c19d34741b0a+ other a@1e71731e6fbb ancestor a@c19d34741b0a |
102 a: versions differ -> m (merge) |
|
103 picked tool 'true' for a (binary False symlink False changedelete False) |
100 picked tool 'true' for a (binary False symlink False changedelete False) |
104 my a@c19d34741b0a+ other a@1e71731e6fbb ancestor a@c19d34741b0a |
101 my a@c19d34741b0a+ other a@1e71731e6fbb ancestor a@c19d34741b0a |
105 launching merge tool: true *$TESTTMP/r2/a* * * (glob) |
102 launching merge tool: true *$TESTTMP/r2/a* * * (glob) |
106 merge tool returned: 0 |
103 merge tool returned: 0 |
107 1 files updated, 1 files merged, 0 files removed, 0 files unresolved |
104 1 files updated, 1 files merged, 0 files removed, 0 files unresolved |