Show More
@@ -100,10 +100,10 b' Test Simple Merge' | |||||
100 | resolving manifests |
|
100 | resolving manifests | |
101 | branchmerge: True, force: False, partial: False |
|
101 | branchmerge: True, force: False, partial: False | |
102 | ancestor: b8bf91eeebbc, local: add3f11052fa+, remote: 17c05bb7fcb6 |
|
102 | ancestor: b8bf91eeebbc, local: add3f11052fa+, remote: 17c05bb7fcb6 | |
|
103 | starting 4 threads for background file closing (?) | |||
103 | preserving a for resolve of b |
|
104 | preserving a for resolve of b | |
104 | preserving a for resolve of c |
|
105 | preserving a for resolve of c | |
105 | removing a |
|
106 | removing a | |
106 | starting 4 threads for background file closing (?) |
|
|||
107 | b: remote moved from a -> m (premerge) |
|
107 | b: remote moved from a -> m (premerge) | |
108 | picked tool ':merge' for b (binary False symlink False changedelete False) |
|
108 | picked tool ':merge' for b (binary False symlink False changedelete False) | |
109 | merging a and b to b |
|
109 | merging a and b to b |
@@ -35,9 +35,9 b" we get conflicts that shouldn't be there" | |||||
35 | resolving manifests |
|
35 | resolving manifests | |
36 | branchmerge: True, force: False, partial: False |
|
36 | branchmerge: True, force: False, partial: False | |
37 | ancestor: e6dc8efe11cc, local: 6a0df1dad128+, remote: 484bf6903104 |
|
37 | ancestor: e6dc8efe11cc, local: 6a0df1dad128+, remote: 484bf6903104 | |
|
38 | starting 4 threads for background file closing (?) | |||
38 | preserving foo for resolve of bar |
|
39 | preserving foo for resolve of bar | |
39 | preserving foo for resolve of foo |
|
40 | preserving foo for resolve of foo | |
40 | starting 4 threads for background file closing (?) |
|
|||
41 | bar: remote copied from foo -> m (premerge) |
|
41 | bar: remote copied from foo -> m (premerge) | |
42 | picked tool ':merge' for bar (binary False symlink False changedelete False) |
|
42 | picked tool ':merge' for bar (binary False symlink False changedelete False) | |
43 | merging foo and bar to bar |
|
43 | merging foo and bar to bar |
@@ -210,8 +210,8 b' Graft out of order, skipping a merge and' | |||||
210 | resolving manifests |
|
210 | resolving manifests | |
211 | branchmerge: True, force: True, partial: False |
|
211 | branchmerge: True, force: True, partial: False | |
212 | ancestor: 68795b066622, local: ef0ef43d49e7+, remote: 5d205f8b35b6 |
|
212 | ancestor: 68795b066622, local: ef0ef43d49e7+, remote: 5d205f8b35b6 | |
|
213 | starting 4 threads for background file closing (?) | |||
213 | preserving b for resolve of b |
|
214 | preserving b for resolve of b | |
214 | starting 4 threads for background file closing (?) |
|
|||
215 | b: local copied/moved from a -> m (premerge) |
|
215 | b: local copied/moved from a -> m (premerge) | |
216 | picked tool ':merge' for b (binary False symlink False changedelete False) |
|
216 | picked tool ':merge' for b (binary False symlink False changedelete False) | |
217 | merging b and a to b |
|
217 | merging b and a to b |
@@ -63,8 +63,8 b' https://bz.mercurial-scm.org/672' | |||||
63 | resolving manifests |
|
63 | resolving manifests | |
64 | branchmerge: True, force: False, partial: False |
|
64 | branchmerge: True, force: False, partial: False | |
65 | ancestor: c64f439569a9, local: f4a9cff3cd0b+, remote: 746e9549ea96 |
|
65 | ancestor: c64f439569a9, local: f4a9cff3cd0b+, remote: 746e9549ea96 | |
|
66 | starting 4 threads for background file closing (?) | |||
66 | preserving 1a for resolve of 1a |
|
67 | preserving 1a for resolve of 1a | |
67 | starting 4 threads for background file closing (?) |
|
|||
68 | 1a: local copied/moved from 1 -> m (premerge) |
|
68 | 1a: local copied/moved from 1 -> m (premerge) | |
69 | picked tool ':merge' for 1a (binary False symlink False changedelete False) |
|
69 | picked tool ':merge' for 1a (binary False symlink False changedelete False) | |
70 | merging 1a and 1 to 1a |
|
70 | merging 1a and 1 to 1a | |
@@ -86,9 +86,9 b' https://bz.mercurial-scm.org/672' | |||||
86 | resolving manifests |
|
86 | resolving manifests | |
87 | branchmerge: True, force: False, partial: False |
|
87 | branchmerge: True, force: False, partial: False | |
88 | ancestor: c64f439569a9, local: 746e9549ea96+, remote: f4a9cff3cd0b |
|
88 | ancestor: c64f439569a9, local: 746e9549ea96+, remote: f4a9cff3cd0b | |
|
89 | starting 4 threads for background file closing (?) | |||
89 | preserving 1 for resolve of 1a |
|
90 | preserving 1 for resolve of 1a | |
90 | removing 1 |
|
91 | removing 1 | |
91 | starting 4 threads for background file closing (?) |
|
|||
92 | 1a: remote moved from 1 -> m (premerge) |
|
92 | 1a: remote moved from 1 -> m (premerge) | |
93 | picked tool ':merge' for 1a (binary False symlink False changedelete False) |
|
93 | picked tool ':merge' for 1a (binary False symlink False changedelete False) | |
94 | merging 1 and 1a to 1a |
|
94 | merging 1 and 1a to 1a |
@@ -70,8 +70,8 b' This should use bar@rev2 as the ancestor' | |||||
70 | resolving manifests |
|
70 | resolving manifests | |
71 | branchmerge: True, force: False, partial: False |
|
71 | branchmerge: True, force: False, partial: False | |
72 | ancestor: 0f2ff26688b9, local: 2263c1be0967+, remote: 0555950ead28 |
|
72 | ancestor: 0f2ff26688b9, local: 2263c1be0967+, remote: 0555950ead28 | |
|
73 | starting 4 threads for background file closing (?) | |||
73 | preserving bar for resolve of bar |
|
74 | preserving bar for resolve of bar | |
74 | starting 4 threads for background file closing (?) |
|
|||
75 | bar: versions differ -> m (premerge) |
|
75 | bar: versions differ -> m (premerge) | |
76 | picked tool ':merge' for bar (binary False symlink False changedelete False) |
|
76 | picked tool ':merge' for bar (binary False symlink False changedelete False) | |
77 | merging bar |
|
77 | merging bar | |
@@ -157,8 +157,8 b' This should use bar@rev2 as the ancestor' | |||||
157 | resolving manifests |
|
157 | resolving manifests | |
158 | branchmerge: True, force: False, partial: False |
|
158 | branchmerge: True, force: False, partial: False | |
159 | ancestor: 0f2ff26688b9, local: 2263c1be0967+, remote: 3ffa6b9e35f0 |
|
159 | ancestor: 0f2ff26688b9, local: 2263c1be0967+, remote: 3ffa6b9e35f0 | |
|
160 | starting 4 threads for background file closing (?) | |||
160 | preserving bar for resolve of bar |
|
161 | preserving bar for resolve of bar | |
161 | starting 4 threads for background file closing (?) |
|
|||
162 | bar: versions differ -> m (premerge) |
|
162 | bar: versions differ -> m (premerge) | |
163 | picked tool ':merge' for bar (binary False symlink False changedelete False) |
|
163 | picked tool ':merge' for bar (binary False symlink False changedelete False) | |
164 | merging bar |
|
164 | merging bar |
@@ -84,8 +84,8 b' pull and merge from test-a again' | |||||
84 | resolving manifests |
|
84 | resolving manifests | |
85 | branchmerge: True, force: False, partial: False |
|
85 | branchmerge: True, force: False, partial: False | |
86 | ancestor: 96b70246a118, local: 50c3a7e29886+, remote: 40d11a4173a8 |
|
86 | ancestor: 96b70246a118, local: 50c3a7e29886+, remote: 40d11a4173a8 | |
|
87 | starting 4 threads for background file closing (?) | |||
87 | preserving test.txt for resolve of test.txt |
|
88 | preserving test.txt for resolve of test.txt | |
88 | starting 4 threads for background file closing (?) |
|
|||
89 | test.txt: versions differ -> m (premerge) |
|
89 | test.txt: versions differ -> m (premerge) | |
90 | picked tool ':merge' for test.txt (binary False symlink False changedelete False) |
|
90 | picked tool ':merge' for test.txt (binary False symlink False changedelete False) | |
91 | merging test.txt |
|
91 | merging test.txt |
@@ -216,8 +216,8 b' modify x and rename y to z on the other ' | |||||
216 | resolving manifests |
|
216 | resolving manifests | |
217 | branchmerge: True, force: False, partial: False |
|
217 | branchmerge: True, force: False, partial: False | |
218 | ancestor: 5151c134577e, local: 07fcbc9a74ed+, remote: f21419739508 |
|
218 | ancestor: 5151c134577e, local: 07fcbc9a74ed+, remote: f21419739508 | |
|
219 | starting 4 threads for background file closing (?) | |||
219 | preserving z for resolve of z |
|
220 | preserving z for resolve of z | |
220 | starting 4 threads for background file closing (?) |
|
|||
221 | z: both renamed from y -> m (premerge) |
|
221 | z: both renamed from y -> m (premerge) | |
222 | picked tool ':merge3' for z (binary False symlink False changedelete False) |
|
222 | picked tool ':merge3' for z (binary False symlink False changedelete False) | |
223 | merging z |
|
223 | merging z |
@@ -85,11 +85,10 b' args:' | |||||
85 | resolving manifests |
|
85 | resolving manifests | |
86 | branchmerge: True, force: False, partial: False |
|
86 | branchmerge: True, force: False, partial: False | |
87 | ancestor: 924404dff337, local: e300d1c794ec+, remote: 4ce40f5aca24 |
|
87 | ancestor: 924404dff337, local: e300d1c794ec+, remote: 4ce40f5aca24 | |
|
88 | starting 4 threads for background file closing (?) | |||
88 | preserving a for resolve of b |
|
89 | preserving a for resolve of b | |
89 | preserving rev for resolve of rev |
|
90 | preserving rev for resolve of rev | |
90 | starting 4 threads for background file closing (?) |
|
|||
91 | b: remote copied from a -> m (premerge) |
|
91 | b: remote copied from a -> m (premerge) | |
92 | starting 4 threads for background file closing (?) |
|
|||
93 | picked tool '* ../merge' for b (binary False symlink False changedelete False) (glob) |
|
92 | picked tool '* ../merge' for b (binary False symlink False changedelete False) (glob) | |
94 | merging a and b to b |
|
93 | merging a and b to b | |
95 | my b@e300d1c794ec+ other b@4ce40f5aca24 ancestor a@924404dff337 |
|
94 | my b@e300d1c794ec+ other b@4ce40f5aca24 ancestor a@924404dff337 | |
@@ -165,10 +164,10 b' args:' | |||||
165 | resolving manifests |
|
164 | resolving manifests | |
166 | branchmerge: True, force: False, partial: False |
|
165 | branchmerge: True, force: False, partial: False | |
167 | ancestor: 924404dff337, local: e300d1c794ec+, remote: bdb19105162a |
|
166 | ancestor: 924404dff337, local: e300d1c794ec+, remote: bdb19105162a | |
|
167 | starting 4 threads for background file closing (?) | |||
168 | preserving a for resolve of b |
|
168 | preserving a for resolve of b | |
169 | preserving rev for resolve of rev |
|
169 | preserving rev for resolve of rev | |
170 | removing a |
|
170 | removing a | |
171 | starting 4 threads for background file closing (?) |
|
|||
172 | b: remote moved from a -> m (premerge) |
|
171 | b: remote moved from a -> m (premerge) | |
173 | picked tool '* ../merge' for b (binary False symlink False changedelete False) (glob) |
|
172 | picked tool '* ../merge' for b (binary False symlink False changedelete False) (glob) | |
174 | merging a and b to b |
|
173 | merging a and b to b | |
@@ -204,9 +203,9 b' args:' | |||||
204 | resolving manifests |
|
203 | resolving manifests | |
205 | branchmerge: True, force: False, partial: False |
|
204 | branchmerge: True, force: False, partial: False | |
206 | ancestor: 924404dff337, local: 02963e448370+, remote: f4db7e329e71 |
|
205 | ancestor: 924404dff337, local: 02963e448370+, remote: f4db7e329e71 | |
|
206 | starting 4 threads for background file closing (?) | |||
207 | preserving b for resolve of b |
|
207 | preserving b for resolve of b | |
208 | preserving rev for resolve of rev |
|
208 | preserving rev for resolve of rev | |
209 | starting 4 threads for background file closing (?) |
|
|||
210 | b: local copied/moved from a -> m (premerge) |
|
209 | b: local copied/moved from a -> m (premerge) | |
211 | picked tool '* ../merge' for b (binary False symlink False changedelete False) (glob) |
|
210 | picked tool '* ../merge' for b (binary False symlink False changedelete False) (glob) | |
212 | merging b and a to b |
|
211 | merging b and a to b | |
@@ -275,8 +274,8 b' args:' | |||||
275 | resolving manifests |
|
274 | resolving manifests | |
276 | branchmerge: True, force: False, partial: False |
|
275 | branchmerge: True, force: False, partial: False | |
277 | ancestor: 924404dff337, local: 86a2aa42fc76+, remote: 97c705ade336 |
|
276 | ancestor: 924404dff337, local: 86a2aa42fc76+, remote: 97c705ade336 | |
|
277 | starting 4 threads for background file closing (?) | |||
278 | preserving rev for resolve of rev |
|
278 | preserving rev for resolve of rev | |
279 | starting 4 threads for background file closing (?) |
|
|||
280 | rev: versions differ -> m (premerge) |
|
279 | rev: versions differ -> m (premerge) | |
281 | picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob) |
|
280 | picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob) | |
282 | merging rev |
|
281 | merging rev | |
@@ -341,8 +340,8 b' args:' | |||||
341 | resolving manifests |
|
340 | resolving manifests | |
342 | branchmerge: True, force: False, partial: False |
|
341 | branchmerge: True, force: False, partial: False | |
343 | ancestor: 924404dff337, local: 02963e448370+, remote: 97c705ade336 |
|
342 | ancestor: 924404dff337, local: 02963e448370+, remote: 97c705ade336 | |
|
343 | starting 4 threads for background file closing (?) | |||
344 | preserving rev for resolve of rev |
|
344 | preserving rev for resolve of rev | |
345 | starting 4 threads for background file closing (?) |
|
|||
346 | rev: versions differ -> m (premerge) |
|
345 | rev: versions differ -> m (premerge) | |
347 | picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob) |
|
346 | picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob) | |
348 | merging rev |
|
347 | merging rev | |
@@ -372,9 +371,9 b' args:' | |||||
372 | resolving manifests |
|
371 | resolving manifests | |
373 | branchmerge: True, force: False, partial: False |
|
372 | branchmerge: True, force: False, partial: False | |
374 | ancestor: 924404dff337, local: 62e7bf090eba+, remote: 49b6d8032493 |
|
373 | ancestor: 924404dff337, local: 62e7bf090eba+, remote: 49b6d8032493 | |
|
374 | starting 4 threads for background file closing (?) | |||
375 | preserving b for resolve of b |
|
375 | preserving b for resolve of b | |
376 | preserving rev for resolve of rev |
|
376 | preserving rev for resolve of rev | |
377 | starting 4 threads for background file closing (?) |
|
|||
378 | b: both renamed from a -> m (premerge) |
|
377 | b: both renamed from a -> m (premerge) | |
379 | picked tool '* ../merge' for b (binary False symlink False changedelete False) (glob) |
|
378 | picked tool '* ../merge' for b (binary False symlink False changedelete False) (glob) | |
380 | merging b |
|
379 | merging b | |
@@ -454,9 +453,9 b' m "um a c" "um x c" " " "10 do merg' | |||||
454 | resolving manifests |
|
453 | resolving manifests | |
455 | branchmerge: True, force: False, partial: False |
|
454 | branchmerge: True, force: False, partial: False | |
456 | ancestor: 924404dff337, local: 86a2aa42fc76+, remote: af30c7647fc7 |
|
455 | ancestor: 924404dff337, local: 86a2aa42fc76+, remote: af30c7647fc7 | |
|
456 | starting 4 threads for background file closing (?) | |||
457 | preserving b for resolve of b |
|
457 | preserving b for resolve of b | |
458 | preserving rev for resolve of rev |
|
458 | preserving rev for resolve of rev | |
459 | starting 4 threads for background file closing (?) |
|
|||
460 | b: both created -> m (premerge) |
|
459 | b: both created -> m (premerge) | |
461 | picked tool '* ../merge' for b (binary False symlink False changedelete False) (glob) |
|
460 | picked tool '* ../merge' for b (binary False symlink False changedelete False) (glob) | |
462 | merging b |
|
461 | merging b | |
@@ -496,9 +495,9 b' m "um a c" "um x c" " " "10 do merg' | |||||
496 | ancestor: 924404dff337, local: 59318016310c+, remote: bdb19105162a |
|
495 | ancestor: 924404dff337, local: 59318016310c+, remote: bdb19105162a | |
497 | a: other deleted -> r |
|
496 | a: other deleted -> r | |
498 | removing a |
|
497 | removing a | |
|
498 | starting 4 threads for background file closing (?) | |||
499 | preserving b for resolve of b |
|
499 | preserving b for resolve of b | |
500 | preserving rev for resolve of rev |
|
500 | preserving rev for resolve of rev | |
501 | starting 4 threads for background file closing (?) |
|
|||
502 | b: both created -> m (premerge) |
|
501 | b: both created -> m (premerge) | |
503 | picked tool '* ../merge' for b (binary False symlink False changedelete False) (glob) |
|
502 | picked tool '* ../merge' for b (binary False symlink False changedelete False) (glob) | |
504 | merging b |
|
503 | merging b | |
@@ -574,9 +573,9 b' m "um a c" "um x c" " " "10 do merg' | |||||
574 | ancestor: 924404dff337, local: 59318016310c+, remote: bdb19105162a |
|
573 | ancestor: 924404dff337, local: 59318016310c+, remote: bdb19105162a | |
575 | a: other deleted -> r |
|
574 | a: other deleted -> r | |
576 | removing a |
|
575 | removing a | |
|
576 | starting 4 threads for background file closing (?) | |||
577 | preserving b for resolve of b |
|
577 | preserving b for resolve of b | |
578 | preserving rev for resolve of rev |
|
578 | preserving rev for resolve of rev | |
579 | starting 4 threads for background file closing (?) |
|
|||
580 | b: both created -> m (premerge) |
|
579 | b: both created -> m (premerge) | |
581 | picked tool '* ../merge' for b (binary False symlink False changedelete False) (glob) |
|
580 | picked tool '* ../merge' for b (binary False symlink False changedelete False) (glob) | |
582 | merging b |
|
581 | merging b | |
@@ -650,11 +649,10 b' m "um a c" "um x c" " " "10 do merg' | |||||
650 | resolving manifests |
|
649 | resolving manifests | |
651 | branchmerge: True, force: False, partial: False |
|
650 | branchmerge: True, force: False, partial: False | |
652 | ancestor: 924404dff337, local: 0b76e65c8289+, remote: 4ce40f5aca24 |
|
651 | ancestor: 924404dff337, local: 0b76e65c8289+, remote: 4ce40f5aca24 | |
|
652 | starting 4 threads for background file closing (?) | |||
653 | preserving b for resolve of b |
|
653 | preserving b for resolve of b | |
654 | preserving rev for resolve of rev |
|
654 | preserving rev for resolve of rev | |
655 | starting 4 threads for background file closing (?) |
|
|||
656 | b: both renamed from a -> m (premerge) |
|
655 | b: both renamed from a -> m (premerge) | |
657 | starting 4 threads for background file closing (?) |
|
|||
658 | picked tool '* ../merge' for b (binary False symlink False changedelete False) (glob) |
|
656 | picked tool '* ../merge' for b (binary False symlink False changedelete False) (glob) | |
659 | merging b |
|
657 | merging b | |
660 | my b@0b76e65c8289+ other b@4ce40f5aca24 ancestor a@924404dff337 |
|
658 | my b@0b76e65c8289+ other b@4ce40f5aca24 ancestor a@924404dff337 | |
@@ -687,9 +685,9 b' m "um a c" "um x c" " " "10 do merg' | |||||
687 | resolving manifests |
|
685 | resolving manifests | |
688 | branchmerge: True, force: False, partial: False |
|
686 | branchmerge: True, force: False, partial: False | |
689 | ancestor: 924404dff337, local: 02963e448370+, remote: 8dbce441892a |
|
687 | ancestor: 924404dff337, local: 02963e448370+, remote: 8dbce441892a | |
|
688 | starting 4 threads for background file closing (?) | |||
690 | preserving b for resolve of b |
|
689 | preserving b for resolve of b | |
691 | preserving rev for resolve of rev |
|
690 | preserving rev for resolve of rev | |
692 | starting 4 threads for background file closing (?) |
|
|||
693 | b: both renamed from a -> m (premerge) |
|
691 | b: both renamed from a -> m (premerge) | |
694 | picked tool '* ../merge' for b (binary False symlink False changedelete False) (glob) |
|
692 | picked tool '* ../merge' for b (binary False symlink False changedelete False) (glob) | |
695 | merging b |
|
693 | merging b | |
@@ -722,9 +720,9 b' m "um a c" "um x c" " " "10 do merg' | |||||
722 | resolving manifests |
|
720 | resolving manifests | |
723 | branchmerge: True, force: False, partial: False |
|
721 | branchmerge: True, force: False, partial: False | |
724 | ancestor: 924404dff337, local: 0b76e65c8289+, remote: bdb19105162a |
|
722 | ancestor: 924404dff337, local: 0b76e65c8289+, remote: bdb19105162a | |
|
723 | starting 4 threads for background file closing (?) | |||
725 | preserving b for resolve of b |
|
724 | preserving b for resolve of b | |
726 | preserving rev for resolve of rev |
|
725 | preserving rev for resolve of rev | |
727 | starting 4 threads for background file closing (?) |
|
|||
728 | b: both renamed from a -> m (premerge) |
|
726 | b: both renamed from a -> m (premerge) | |
729 | picked tool '* ../merge' for b (binary False symlink False changedelete False) (glob) |
|
727 | picked tool '* ../merge' for b (binary False symlink False changedelete False) (glob) | |
730 | merging b |
|
728 | merging b | |
@@ -760,10 +758,10 b' m "um a c" "um x c" " " "10 do merg' | |||||
760 | resolving manifests |
|
758 | resolving manifests | |
761 | branchmerge: True, force: False, partial: False |
|
759 | branchmerge: True, force: False, partial: False | |
762 | ancestor: 924404dff337, local: e300d1c794ec+, remote: 49b6d8032493 |
|
760 | ancestor: 924404dff337, local: e300d1c794ec+, remote: 49b6d8032493 | |
|
761 | starting 4 threads for background file closing (?) | |||
763 | preserving a for resolve of b |
|
762 | preserving a for resolve of b | |
764 | preserving rev for resolve of rev |
|
763 | preserving rev for resolve of rev | |
765 | removing a |
|
764 | removing a | |
766 | starting 4 threads for background file closing (?) |
|
|||
767 | b: remote moved from a -> m (premerge) |
|
765 | b: remote moved from a -> m (premerge) | |
768 | picked tool '* ../merge' for b (binary False symlink False changedelete False) (glob) |
|
766 | picked tool '* ../merge' for b (binary False symlink False changedelete False) (glob) | |
769 | merging a and b to b |
|
767 | merging a and b to b | |
@@ -803,9 +801,9 b' m "um a c" "um x c" " " "10 do merg' | |||||
803 | resolving manifests |
|
801 | resolving manifests | |
804 | branchmerge: True, force: False, partial: False |
|
802 | branchmerge: True, force: False, partial: False | |
805 | ancestor: 924404dff337, local: 62e7bf090eba+, remote: f4db7e329e71 |
|
803 | ancestor: 924404dff337, local: 62e7bf090eba+, remote: f4db7e329e71 | |
|
804 | starting 4 threads for background file closing (?) | |||
806 | preserving b for resolve of b |
|
805 | preserving b for resolve of b | |
807 | preserving rev for resolve of rev |
|
806 | preserving rev for resolve of rev | |
808 | starting 4 threads for background file closing (?) |
|
|||
809 | b: local copied/moved from a -> m (premerge) |
|
807 | b: local copied/moved from a -> m (premerge) | |
810 | picked tool '* ../merge' for b (binary False symlink False changedelete False) (glob) |
|
808 | picked tool '* ../merge' for b (binary False symlink False changedelete False) (glob) | |
811 | merging b and a to b |
|
809 | merging b and a to b |
@@ -315,8 +315,8 b' merge tests' | |||||
315 | resolving manifests |
|
315 | resolving manifests | |
316 | branchmerge: True, force: False, partial: False |
|
316 | branchmerge: True, force: False, partial: False | |
317 | ancestor: 6747d179aa9a, local: 20a0db6fbf6c+, remote: 7af322bc1198 |
|
317 | ancestor: 6747d179aa9a, local: 20a0db6fbf6c+, remote: 7af322bc1198 | |
|
318 | starting 4 threads for background file closing (?) | |||
318 | preserving t for resolve of t |
|
319 | preserving t for resolve of t | |
319 | starting 4 threads for background file closing (?) |
|
|||
320 | t: versions differ -> m (premerge) |
|
320 | t: versions differ -> m (premerge) | |
321 | picked tool ':merge' for t (binary False symlink False changedelete False) |
|
321 | picked tool ':merge' for t (binary False symlink False changedelete False) | |
322 | merging t |
|
322 | merging t |
@@ -70,8 +70,8 b'' | |||||
70 | ancestor: 1e71731e6fbb, local: 1e71731e6fbb+, remote: c19d34741b0a |
|
70 | ancestor: 1e71731e6fbb, local: 1e71731e6fbb+, remote: c19d34741b0a | |
71 | b: other deleted -> r |
|
71 | b: other deleted -> r | |
72 | removing b |
|
72 | removing b | |
|
73 | starting 4 threads for background file closing (?) | |||
73 | preserving a for resolve of a |
|
74 | preserving a for resolve of a | |
74 | starting 4 threads for background file closing (?) |
|
|||
75 | a: versions differ -> m (premerge) |
|
75 | a: versions differ -> m (premerge) | |
76 | picked tool 'true' for a (binary False symlink False changedelete False) |
|
76 | picked tool 'true' for a (binary False symlink False changedelete False) | |
77 | merging a |
|
77 | merging a |
General Comments 0
You need to be logged in to leave comments.
Login now