87 branchmerge: True, force: False, partial: False |
87 branchmerge: True, force: False, partial: False |
88 ancestor: 924404dff337, local: e300d1c794ec+, remote: 4ce40f5aca24 |
88 ancestor: 924404dff337, local: e300d1c794ec+, remote: 4ce40f5aca24 |
89 preserving a for resolve of b |
89 preserving a for resolve of b |
90 preserving rev for resolve of rev |
90 preserving rev for resolve of rev |
91 a: remote unchanged -> k |
91 a: remote unchanged -> k |
92 b: remote copied from a -> m |
92 b: remote copied from a -> m (premerge) |
93 picked tool 'python ../merge' for b (binary False symlink False) |
93 picked tool 'python ../merge' for b (binary False symlink False) |
94 merging a and b to b |
94 merging a and b to b |
95 my b@e300d1c794ec+ other b@4ce40f5aca24 ancestor a@924404dff337 |
95 my b@e300d1c794ec+ other b@4ce40f5aca24 ancestor a@924404dff337 |
96 premerge successful |
96 premerge successful |
97 rev: versions differ -> m |
97 rev: versions differ -> m (premerge) |
98 picked tool 'python ../merge' for rev (binary False symlink False) |
98 picked tool 'python ../merge' for rev (binary False symlink False) |
99 merging rev |
99 merging rev |
100 my rev@e300d1c794ec+ other rev@4ce40f5aca24 ancestor rev@924404dff337 |
100 my rev@e300d1c794ec+ other rev@4ce40f5aca24 ancestor rev@924404dff337 |
|
101 rev: versions differ -> m (merge) |
101 picked tool 'python ../merge' for rev (binary False symlink False) |
102 picked tool 'python ../merge' for rev (binary False symlink False) |
102 my rev@e300d1c794ec+ other rev@4ce40f5aca24 ancestor rev@924404dff337 |
103 my rev@e300d1c794ec+ other rev@4ce40f5aca24 ancestor rev@924404dff337 |
103 launching merge tool: python ../merge *$TESTTMP/t/t/rev* * * (glob) |
104 launching merge tool: python ../merge *$TESTTMP/t/t/rev* * * (glob) |
104 merge tool returned: 0 |
105 merge tool returned: 0 |
105 0 files updated, 2 files merged, 0 files removed, 0 files unresolved |
106 0 files updated, 2 files merged, 0 files removed, 0 files unresolved |
126 ancestor: 924404dff337, local: 86a2aa42fc76+, remote: f4db7e329e71 |
127 ancestor: 924404dff337, local: 86a2aa42fc76+, remote: f4db7e329e71 |
127 preserving b for resolve of b |
128 preserving b for resolve of b |
128 preserving rev for resolve of rev |
129 preserving rev for resolve of rev |
129 a: remote is newer -> g |
130 a: remote is newer -> g |
130 getting a |
131 getting a |
131 b: local copied/moved from a -> m |
132 b: local copied/moved from a -> m (premerge) |
132 picked tool 'python ../merge' for b (binary False symlink False) |
133 picked tool 'python ../merge' for b (binary False symlink False) |
133 merging b and a to b |
134 merging b and a to b |
134 my b@86a2aa42fc76+ other a@f4db7e329e71 ancestor a@924404dff337 |
135 my b@86a2aa42fc76+ other a@f4db7e329e71 ancestor a@924404dff337 |
135 premerge successful |
136 premerge successful |
136 rev: versions differ -> m |
137 rev: versions differ -> m (premerge) |
137 picked tool 'python ../merge' for rev (binary False symlink False) |
138 picked tool 'python ../merge' for rev (binary False symlink False) |
138 merging rev |
139 merging rev |
139 my rev@86a2aa42fc76+ other rev@f4db7e329e71 ancestor rev@924404dff337 |
140 my rev@86a2aa42fc76+ other rev@f4db7e329e71 ancestor rev@924404dff337 |
|
141 rev: versions differ -> m (merge) |
140 picked tool 'python ../merge' for rev (binary False symlink False) |
142 picked tool 'python ../merge' for rev (binary False symlink False) |
141 my rev@86a2aa42fc76+ other rev@f4db7e329e71 ancestor rev@924404dff337 |
143 my rev@86a2aa42fc76+ other rev@f4db7e329e71 ancestor rev@924404dff337 |
142 launching merge tool: python ../merge *$TESTTMP/t/t/rev* * * (glob) |
144 launching merge tool: python ../merge *$TESTTMP/t/t/rev* * * (glob) |
143 merge tool returned: 0 |
145 merge tool returned: 0 |
144 1 files updated, 2 files merged, 0 files removed, 0 files unresolved |
146 1 files updated, 2 files merged, 0 files removed, 0 files unresolved |
164 branchmerge: True, force: False, partial: False |
166 branchmerge: True, force: False, partial: False |
165 ancestor: 924404dff337, local: e300d1c794ec+, remote: bdb19105162a |
167 ancestor: 924404dff337, local: e300d1c794ec+, remote: bdb19105162a |
166 preserving a for resolve of b |
168 preserving a for resolve of b |
167 preserving rev for resolve of rev |
169 preserving rev for resolve of rev |
168 removing a |
170 removing a |
169 b: remote moved from a -> m |
171 b: remote moved from a -> m (premerge) |
170 picked tool 'python ../merge' for b (binary False symlink False) |
172 picked tool 'python ../merge' for b (binary False symlink False) |
171 merging a and b to b |
173 merging a and b to b |
172 my b@e300d1c794ec+ other b@bdb19105162a ancestor a@924404dff337 |
174 my b@e300d1c794ec+ other b@bdb19105162a ancestor a@924404dff337 |
173 premerge successful |
175 premerge successful |
174 rev: versions differ -> m |
176 rev: versions differ -> m (premerge) |
175 picked tool 'python ../merge' for rev (binary False symlink False) |
177 picked tool 'python ../merge' for rev (binary False symlink False) |
176 merging rev |
178 merging rev |
177 my rev@e300d1c794ec+ other rev@bdb19105162a ancestor rev@924404dff337 |
179 my rev@e300d1c794ec+ other rev@bdb19105162a ancestor rev@924404dff337 |
|
180 rev: versions differ -> m (merge) |
178 picked tool 'python ../merge' for rev (binary False symlink False) |
181 picked tool 'python ../merge' for rev (binary False symlink False) |
179 my rev@e300d1c794ec+ other rev@bdb19105162a ancestor rev@924404dff337 |
182 my rev@e300d1c794ec+ other rev@bdb19105162a ancestor rev@924404dff337 |
180 launching merge tool: python ../merge *$TESTTMP/t/t/rev* * * (glob) |
183 launching merge tool: python ../merge *$TESTTMP/t/t/rev* * * (glob) |
181 merge tool returned: 0 |
184 merge tool returned: 0 |
182 0 files updated, 2 files merged, 0 files removed, 0 files unresolved |
185 0 files updated, 2 files merged, 0 files removed, 0 files unresolved |
200 resolving manifests |
203 resolving manifests |
201 branchmerge: True, force: False, partial: False |
204 branchmerge: True, force: False, partial: False |
202 ancestor: 924404dff337, local: 02963e448370+, remote: f4db7e329e71 |
205 ancestor: 924404dff337, local: 02963e448370+, remote: f4db7e329e71 |
203 preserving b for resolve of b |
206 preserving b for resolve of b |
204 preserving rev for resolve of rev |
207 preserving rev for resolve of rev |
205 b: local copied/moved from a -> m |
208 b: local copied/moved from a -> m (premerge) |
206 picked tool 'python ../merge' for b (binary False symlink False) |
209 picked tool 'python ../merge' for b (binary False symlink False) |
207 merging b and a to b |
210 merging b and a to b |
208 my b@02963e448370+ other a@f4db7e329e71 ancestor a@924404dff337 |
211 my b@02963e448370+ other a@f4db7e329e71 ancestor a@924404dff337 |
209 premerge successful |
212 premerge successful |
210 rev: versions differ -> m |
213 rev: versions differ -> m (premerge) |
211 picked tool 'python ../merge' for rev (binary False symlink False) |
214 picked tool 'python ../merge' for rev (binary False symlink False) |
212 merging rev |
215 merging rev |
213 my rev@02963e448370+ other rev@f4db7e329e71 ancestor rev@924404dff337 |
216 my rev@02963e448370+ other rev@f4db7e329e71 ancestor rev@924404dff337 |
|
217 rev: versions differ -> m (merge) |
214 picked tool 'python ../merge' for rev (binary False symlink False) |
218 picked tool 'python ../merge' for rev (binary False symlink False) |
215 my rev@02963e448370+ other rev@f4db7e329e71 ancestor rev@924404dff337 |
219 my rev@02963e448370+ other rev@f4db7e329e71 ancestor rev@924404dff337 |
216 launching merge tool: python ../merge *$TESTTMP/t/t/rev* * * (glob) |
220 launching merge tool: python ../merge *$TESTTMP/t/t/rev* * * (glob) |
217 merge tool returned: 0 |
221 merge tool returned: 0 |
218 0 files updated, 2 files merged, 0 files removed, 0 files unresolved |
222 0 files updated, 2 files merged, 0 files removed, 0 files unresolved |
237 branchmerge: True, force: False, partial: False |
241 branchmerge: True, force: False, partial: False |
238 ancestor: 924404dff337, local: 94b33a1b7f2d+, remote: 4ce40f5aca24 |
242 ancestor: 924404dff337, local: 94b33a1b7f2d+, remote: 4ce40f5aca24 |
239 preserving rev for resolve of rev |
243 preserving rev for resolve of rev |
240 b: remote created -> g |
244 b: remote created -> g |
241 getting b |
245 getting b |
242 rev: versions differ -> m |
246 rev: versions differ -> m (premerge) |
243 picked tool 'python ../merge' for rev (binary False symlink False) |
247 picked tool 'python ../merge' for rev (binary False symlink False) |
244 merging rev |
248 merging rev |
245 my rev@94b33a1b7f2d+ other rev@4ce40f5aca24 ancestor rev@924404dff337 |
249 my rev@94b33a1b7f2d+ other rev@4ce40f5aca24 ancestor rev@924404dff337 |
|
250 rev: versions differ -> m (merge) |
246 picked tool 'python ../merge' for rev (binary False symlink False) |
251 picked tool 'python ../merge' for rev (binary False symlink False) |
247 my rev@94b33a1b7f2d+ other rev@4ce40f5aca24 ancestor rev@924404dff337 |
252 my rev@94b33a1b7f2d+ other rev@4ce40f5aca24 ancestor rev@924404dff337 |
248 launching merge tool: python ../merge *$TESTTMP/t/t/rev* * * (glob) |
253 launching merge tool: python ../merge *$TESTTMP/t/t/rev* * * (glob) |
249 merge tool returned: 0 |
254 merge tool returned: 0 |
250 1 files updated, 1 files merged, 0 files removed, 0 files unresolved |
255 1 files updated, 1 files merged, 0 files removed, 0 files unresolved |
267 checking for directory renames |
272 checking for directory renames |
268 resolving manifests |
273 resolving manifests |
269 branchmerge: True, force: False, partial: False |
274 branchmerge: True, force: False, partial: False |
270 ancestor: 924404dff337, local: 86a2aa42fc76+, remote: 97c705ade336 |
275 ancestor: 924404dff337, local: 86a2aa42fc76+, remote: 97c705ade336 |
271 preserving rev for resolve of rev |
276 preserving rev for resolve of rev |
272 rev: versions differ -> m |
277 rev: versions differ -> m (premerge) |
273 picked tool 'python ../merge' for rev (binary False symlink False) |
278 picked tool 'python ../merge' for rev (binary False symlink False) |
274 merging rev |
279 merging rev |
275 my rev@86a2aa42fc76+ other rev@97c705ade336 ancestor rev@924404dff337 |
280 my rev@86a2aa42fc76+ other rev@97c705ade336 ancestor rev@924404dff337 |
|
281 rev: versions differ -> m (merge) |
276 picked tool 'python ../merge' for rev (binary False symlink False) |
282 picked tool 'python ../merge' for rev (binary False symlink False) |
277 my rev@86a2aa42fc76+ other rev@97c705ade336 ancestor rev@924404dff337 |
283 my rev@86a2aa42fc76+ other rev@97c705ade336 ancestor rev@924404dff337 |
278 launching merge tool: python ../merge *$TESTTMP/t/t/rev* * * (glob) |
284 launching merge tool: python ../merge *$TESTTMP/t/t/rev* * * (glob) |
279 merge tool returned: 0 |
285 merge tool returned: 0 |
280 0 files updated, 1 files merged, 0 files removed, 0 files unresolved |
286 0 files updated, 1 files merged, 0 files removed, 0 files unresolved |
301 preserving rev for resolve of rev |
307 preserving rev for resolve of rev |
302 a: other deleted -> r |
308 a: other deleted -> r |
303 removing a |
309 removing a |
304 b: remote created -> g |
310 b: remote created -> g |
305 getting b |
311 getting b |
306 rev: versions differ -> m |
312 rev: versions differ -> m (premerge) |
307 picked tool 'python ../merge' for rev (binary False symlink False) |
313 picked tool 'python ../merge' for rev (binary False symlink False) |
308 merging rev |
314 merging rev |
309 my rev@94b33a1b7f2d+ other rev@bdb19105162a ancestor rev@924404dff337 |
315 my rev@94b33a1b7f2d+ other rev@bdb19105162a ancestor rev@924404dff337 |
|
316 rev: versions differ -> m (merge) |
310 picked tool 'python ../merge' for rev (binary False symlink False) |
317 picked tool 'python ../merge' for rev (binary False symlink False) |
311 my rev@94b33a1b7f2d+ other rev@bdb19105162a ancestor rev@924404dff337 |
318 my rev@94b33a1b7f2d+ other rev@bdb19105162a ancestor rev@924404dff337 |
312 launching merge tool: python ../merge *$TESTTMP/t/t/rev* * * (glob) |
319 launching merge tool: python ../merge *$TESTTMP/t/t/rev* * * (glob) |
313 merge tool returned: 0 |
320 merge tool returned: 0 |
314 1 files updated, 1 files merged, 1 files removed, 0 files unresolved |
321 1 files updated, 1 files merged, 1 files removed, 0 files unresolved |
330 checking for directory renames |
337 checking for directory renames |
331 resolving manifests |
338 resolving manifests |
332 branchmerge: True, force: False, partial: False |
339 branchmerge: True, force: False, partial: False |
333 ancestor: 924404dff337, local: 02963e448370+, remote: 97c705ade336 |
340 ancestor: 924404dff337, local: 02963e448370+, remote: 97c705ade336 |
334 preserving rev for resolve of rev |
341 preserving rev for resolve of rev |
335 rev: versions differ -> m |
342 rev: versions differ -> m (premerge) |
336 picked tool 'python ../merge' for rev (binary False symlink False) |
343 picked tool 'python ../merge' for rev (binary False symlink False) |
337 merging rev |
344 merging rev |
338 my rev@02963e448370+ other rev@97c705ade336 ancestor rev@924404dff337 |
345 my rev@02963e448370+ other rev@97c705ade336 ancestor rev@924404dff337 |
|
346 rev: versions differ -> m (merge) |
339 picked tool 'python ../merge' for rev (binary False symlink False) |
347 picked tool 'python ../merge' for rev (binary False symlink False) |
340 my rev@02963e448370+ other rev@97c705ade336 ancestor rev@924404dff337 |
348 my rev@02963e448370+ other rev@97c705ade336 ancestor rev@924404dff337 |
341 launching merge tool: python ../merge *$TESTTMP/t/t/rev* * * (glob) |
349 launching merge tool: python ../merge *$TESTTMP/t/t/rev* * * (glob) |
342 merge tool returned: 0 |
350 merge tool returned: 0 |
343 0 files updated, 1 files merged, 0 files removed, 0 files unresolved |
351 0 files updated, 1 files merged, 0 files removed, 0 files unresolved |
357 resolving manifests |
365 resolving manifests |
358 branchmerge: True, force: False, partial: False |
366 branchmerge: True, force: False, partial: False |
359 ancestor: 924404dff337, local: 62e7bf090eba+, remote: 49b6d8032493 |
367 ancestor: 924404dff337, local: 62e7bf090eba+, remote: 49b6d8032493 |
360 preserving b for resolve of b |
368 preserving b for resolve of b |
361 preserving rev for resolve of rev |
369 preserving rev for resolve of rev |
362 b: both renamed from a -> m |
370 b: both renamed from a -> m (premerge) |
363 picked tool 'python ../merge' for b (binary False symlink False) |
371 picked tool 'python ../merge' for b (binary False symlink False) |
364 merging b |
372 merging b |
365 my b@62e7bf090eba+ other b@49b6d8032493 ancestor a@924404dff337 |
373 my b@62e7bf090eba+ other b@49b6d8032493 ancestor a@924404dff337 |
|
374 rev: versions differ -> m (premerge) |
|
375 picked tool 'python ../merge' for rev (binary False symlink False) |
|
376 merging rev |
|
377 my rev@62e7bf090eba+ other rev@49b6d8032493 ancestor rev@924404dff337 |
|
378 b: both renamed from a -> m (merge) |
366 picked tool 'python ../merge' for b (binary False symlink False) |
379 picked tool 'python ../merge' for b (binary False symlink False) |
367 my b@62e7bf090eba+ other b@49b6d8032493 ancestor a@924404dff337 |
380 my b@62e7bf090eba+ other b@49b6d8032493 ancestor a@924404dff337 |
368 launching merge tool: python ../merge *$TESTTMP/t/t/b* * * (glob) |
381 launching merge tool: python ../merge *$TESTTMP/t/t/b* * * (glob) |
369 merge tool returned: 0 |
382 merge tool returned: 0 |
370 rev: versions differ -> m |
383 rev: versions differ -> m (merge) |
371 picked tool 'python ../merge' for rev (binary False symlink False) |
|
372 merging rev |
|
373 my rev@62e7bf090eba+ other rev@49b6d8032493 ancestor rev@924404dff337 |
|
374 picked tool 'python ../merge' for rev (binary False symlink False) |
384 picked tool 'python ../merge' for rev (binary False symlink False) |
375 my rev@62e7bf090eba+ other rev@49b6d8032493 ancestor rev@924404dff337 |
385 my rev@62e7bf090eba+ other rev@49b6d8032493 ancestor rev@924404dff337 |
376 launching merge tool: python ../merge *$TESTTMP/t/t/rev* * * (glob) |
386 launching merge tool: python ../merge *$TESTTMP/t/t/rev* * * (glob) |
377 merge tool returned: 0 |
387 merge tool returned: 0 |
378 0 files updated, 2 files merged, 0 files removed, 0 files unresolved |
388 0 files updated, 2 files merged, 0 files removed, 0 files unresolved |
402 branchmerge: True, force: False, partial: False |
412 branchmerge: True, force: False, partial: False |
403 ancestor: 924404dff337, local: 02963e448370+, remote: fe905ef2c33e |
413 ancestor: 924404dff337, local: 02963e448370+, remote: fe905ef2c33e |
404 preserving rev for resolve of rev |
414 preserving rev for resolve of rev |
405 c: remote created -> g |
415 c: remote created -> g |
406 getting c |
416 getting c |
407 rev: versions differ -> m |
417 rev: versions differ -> m (premerge) |
408 picked tool 'python ../merge' for rev (binary False symlink False) |
418 picked tool 'python ../merge' for rev (binary False symlink False) |
409 merging rev |
419 merging rev |
410 my rev@02963e448370+ other rev@fe905ef2c33e ancestor rev@924404dff337 |
420 my rev@02963e448370+ other rev@fe905ef2c33e ancestor rev@924404dff337 |
|
421 rev: versions differ -> m (merge) |
411 picked tool 'python ../merge' for rev (binary False symlink False) |
422 picked tool 'python ../merge' for rev (binary False symlink False) |
412 my rev@02963e448370+ other rev@fe905ef2c33e ancestor rev@924404dff337 |
423 my rev@02963e448370+ other rev@fe905ef2c33e ancestor rev@924404dff337 |
413 launching merge tool: python ../merge *$TESTTMP/t/t/rev* * * (glob) |
424 launching merge tool: python ../merge *$TESTTMP/t/t/rev* * * (glob) |
414 merge tool returned: 0 |
425 merge tool returned: 0 |
415 note: possible conflict - a was renamed multiple times to: |
426 note: possible conflict - a was renamed multiple times to: |
433 resolving manifests |
444 resolving manifests |
434 branchmerge: True, force: False, partial: False |
445 branchmerge: True, force: False, partial: False |
435 ancestor: 924404dff337, local: 86a2aa42fc76+, remote: af30c7647fc7 |
446 ancestor: 924404dff337, local: 86a2aa42fc76+, remote: af30c7647fc7 |
436 preserving b for resolve of b |
447 preserving b for resolve of b |
437 preserving rev for resolve of rev |
448 preserving rev for resolve of rev |
438 b: both created -> m |
449 b: both created -> m (premerge) |
439 picked tool 'python ../merge' for b (binary False symlink False) |
450 picked tool 'python ../merge' for b (binary False symlink False) |
440 merging b |
451 merging b |
441 my b@86a2aa42fc76+ other b@af30c7647fc7 ancestor b@000000000000 |
452 my b@86a2aa42fc76+ other b@af30c7647fc7 ancestor b@000000000000 |
|
453 rev: versions differ -> m (premerge) |
|
454 picked tool 'python ../merge' for rev (binary False symlink False) |
|
455 merging rev |
|
456 my rev@86a2aa42fc76+ other rev@af30c7647fc7 ancestor rev@924404dff337 |
|
457 b: both created -> m (merge) |
442 picked tool 'python ../merge' for b (binary False symlink False) |
458 picked tool 'python ../merge' for b (binary False symlink False) |
443 my b@86a2aa42fc76+ other b@af30c7647fc7 ancestor b@000000000000 |
459 my b@86a2aa42fc76+ other b@af30c7647fc7 ancestor b@000000000000 |
444 launching merge tool: python ../merge *$TESTTMP/t/t/b* * * (glob) |
460 launching merge tool: python ../merge *$TESTTMP/t/t/b* * * (glob) |
445 merge tool returned: 0 |
461 merge tool returned: 0 |
446 rev: versions differ -> m |
462 rev: versions differ -> m (merge) |
447 picked tool 'python ../merge' for rev (binary False symlink False) |
|
448 merging rev |
|
449 my rev@86a2aa42fc76+ other rev@af30c7647fc7 ancestor rev@924404dff337 |
|
450 picked tool 'python ../merge' for rev (binary False symlink False) |
463 picked tool 'python ../merge' for rev (binary False symlink False) |
451 my rev@86a2aa42fc76+ other rev@af30c7647fc7 ancestor rev@924404dff337 |
464 my rev@86a2aa42fc76+ other rev@af30c7647fc7 ancestor rev@924404dff337 |
452 launching merge tool: python ../merge *$TESTTMP/t/t/rev* * * (glob) |
465 launching merge tool: python ../merge *$TESTTMP/t/t/rev* * * (glob) |
453 merge tool returned: 0 |
466 merge tool returned: 0 |
454 0 files updated, 2 files merged, 0 files removed, 0 files unresolved |
467 0 files updated, 2 files merged, 0 files removed, 0 files unresolved |
471 ancestor: 924404dff337, local: 59318016310c+, remote: bdb19105162a |
484 ancestor: 924404dff337, local: 59318016310c+, remote: bdb19105162a |
472 preserving b for resolve of b |
485 preserving b for resolve of b |
473 preserving rev for resolve of rev |
486 preserving rev for resolve of rev |
474 a: other deleted -> r |
487 a: other deleted -> r |
475 removing a |
488 removing a |
476 b: both created -> m |
489 b: both created -> m (premerge) |
477 picked tool 'python ../merge' for b (binary False symlink False) |
490 picked tool 'python ../merge' for b (binary False symlink False) |
478 merging b |
491 merging b |
479 my b@59318016310c+ other b@bdb19105162a ancestor b@000000000000 |
492 my b@59318016310c+ other b@bdb19105162a ancestor b@000000000000 |
|
493 rev: versions differ -> m (premerge) |
|
494 picked tool 'python ../merge' for rev (binary False symlink False) |
|
495 merging rev |
|
496 my rev@59318016310c+ other rev@bdb19105162a ancestor rev@924404dff337 |
|
497 b: both created -> m (merge) |
480 picked tool 'python ../merge' for b (binary False symlink False) |
498 picked tool 'python ../merge' for b (binary False symlink False) |
481 my b@59318016310c+ other b@bdb19105162a ancestor b@000000000000 |
499 my b@59318016310c+ other b@bdb19105162a ancestor b@000000000000 |
482 launching merge tool: python ../merge *$TESTTMP/t/t/b* * * (glob) |
500 launching merge tool: python ../merge *$TESTTMP/t/t/b* * * (glob) |
483 merge tool returned: 0 |
501 merge tool returned: 0 |
484 rev: versions differ -> m |
502 rev: versions differ -> m (merge) |
485 picked tool 'python ../merge' for rev (binary False symlink False) |
|
486 merging rev |
|
487 my rev@59318016310c+ other rev@bdb19105162a ancestor rev@924404dff337 |
|
488 picked tool 'python ../merge' for rev (binary False symlink False) |
503 picked tool 'python ../merge' for rev (binary False symlink False) |
489 my rev@59318016310c+ other rev@bdb19105162a ancestor rev@924404dff337 |
504 my rev@59318016310c+ other rev@bdb19105162a ancestor rev@924404dff337 |
490 launching merge tool: python ../merge *$TESTTMP/t/t/rev* * * (glob) |
505 launching merge tool: python ../merge *$TESTTMP/t/t/rev* * * (glob) |
491 merge tool returned: 0 |
506 merge tool returned: 0 |
492 0 files updated, 2 files merged, 1 files removed, 0 files unresolved |
507 0 files updated, 2 files merged, 1 files removed, 0 files unresolved |
508 ancestor: 924404dff337, local: 86a2aa42fc76+, remote: 8dbce441892a |
523 ancestor: 924404dff337, local: 86a2aa42fc76+, remote: 8dbce441892a |
509 preserving b for resolve of b |
524 preserving b for resolve of b |
510 preserving rev for resolve of rev |
525 preserving rev for resolve of rev |
511 a: remote is newer -> g |
526 a: remote is newer -> g |
512 getting a |
527 getting a |
513 b: both created -> m |
528 b: both created -> m (premerge) |
514 picked tool 'python ../merge' for b (binary False symlink False) |
529 picked tool 'python ../merge' for b (binary False symlink False) |
515 merging b |
530 merging b |
516 my b@86a2aa42fc76+ other b@8dbce441892a ancestor b@000000000000 |
531 my b@86a2aa42fc76+ other b@8dbce441892a ancestor b@000000000000 |
|
532 rev: versions differ -> m (premerge) |
|
533 picked tool 'python ../merge' for rev (binary False symlink False) |
|
534 merging rev |
|
535 my rev@86a2aa42fc76+ other rev@8dbce441892a ancestor rev@924404dff337 |
|
536 b: both created -> m (merge) |
517 picked tool 'python ../merge' for b (binary False symlink False) |
537 picked tool 'python ../merge' for b (binary False symlink False) |
518 my b@86a2aa42fc76+ other b@8dbce441892a ancestor b@000000000000 |
538 my b@86a2aa42fc76+ other b@8dbce441892a ancestor b@000000000000 |
519 launching merge tool: python ../merge *$TESTTMP/t/t/b* * * (glob) |
539 launching merge tool: python ../merge *$TESTTMP/t/t/b* * * (glob) |
520 merge tool returned: 0 |
540 merge tool returned: 0 |
521 rev: versions differ -> m |
541 rev: versions differ -> m (merge) |
522 picked tool 'python ../merge' for rev (binary False symlink False) |
|
523 merging rev |
|
524 my rev@86a2aa42fc76+ other rev@8dbce441892a ancestor rev@924404dff337 |
|
525 picked tool 'python ../merge' for rev (binary False symlink False) |
542 picked tool 'python ../merge' for rev (binary False symlink False) |
526 my rev@86a2aa42fc76+ other rev@8dbce441892a ancestor rev@924404dff337 |
543 my rev@86a2aa42fc76+ other rev@8dbce441892a ancestor rev@924404dff337 |
527 launching merge tool: python ../merge *$TESTTMP/t/t/rev* * * (glob) |
544 launching merge tool: python ../merge *$TESTTMP/t/t/rev* * * (glob) |
528 merge tool returned: 0 |
545 merge tool returned: 0 |
529 1 files updated, 2 files merged, 0 files removed, 0 files unresolved |
546 1 files updated, 2 files merged, 0 files removed, 0 files unresolved |
546 ancestor: 924404dff337, local: 59318016310c+, remote: bdb19105162a |
563 ancestor: 924404dff337, local: 59318016310c+, remote: bdb19105162a |
547 preserving b for resolve of b |
564 preserving b for resolve of b |
548 preserving rev for resolve of rev |
565 preserving rev for resolve of rev |
549 a: other deleted -> r |
566 a: other deleted -> r |
550 removing a |
567 removing a |
551 b: both created -> m |
568 b: both created -> m (premerge) |
552 picked tool 'python ../merge' for b (binary False symlink False) |
569 picked tool 'python ../merge' for b (binary False symlink False) |
553 merging b |
570 merging b |
554 my b@59318016310c+ other b@bdb19105162a ancestor b@000000000000 |
571 my b@59318016310c+ other b@bdb19105162a ancestor b@000000000000 |
|
572 rev: versions differ -> m (premerge) |
|
573 picked tool 'python ../merge' for rev (binary False symlink False) |
|
574 merging rev |
|
575 my rev@59318016310c+ other rev@bdb19105162a ancestor rev@924404dff337 |
|
576 b: both created -> m (merge) |
555 picked tool 'python ../merge' for b (binary False symlink False) |
577 picked tool 'python ../merge' for b (binary False symlink False) |
556 my b@59318016310c+ other b@bdb19105162a ancestor b@000000000000 |
578 my b@59318016310c+ other b@bdb19105162a ancestor b@000000000000 |
557 launching merge tool: python ../merge *$TESTTMP/t/t/b* * * (glob) |
579 launching merge tool: python ../merge *$TESTTMP/t/t/b* * * (glob) |
558 merge tool returned: 0 |
580 merge tool returned: 0 |
559 rev: versions differ -> m |
581 rev: versions differ -> m (merge) |
560 picked tool 'python ../merge' for rev (binary False symlink False) |
|
561 merging rev |
|
562 my rev@59318016310c+ other rev@bdb19105162a ancestor rev@924404dff337 |
|
563 picked tool 'python ../merge' for rev (binary False symlink False) |
582 picked tool 'python ../merge' for rev (binary False symlink False) |
564 my rev@59318016310c+ other rev@bdb19105162a ancestor rev@924404dff337 |
583 my rev@59318016310c+ other rev@bdb19105162a ancestor rev@924404dff337 |
565 launching merge tool: python ../merge *$TESTTMP/t/t/rev* * * (glob) |
584 launching merge tool: python ../merge *$TESTTMP/t/t/rev* * * (glob) |
566 merge tool returned: 0 |
585 merge tool returned: 0 |
567 0 files updated, 2 files merged, 1 files removed, 0 files unresolved |
586 0 files updated, 2 files merged, 1 files removed, 0 files unresolved |
583 ancestor: 924404dff337, local: 86a2aa42fc76+, remote: 8dbce441892a |
602 ancestor: 924404dff337, local: 86a2aa42fc76+, remote: 8dbce441892a |
584 preserving b for resolve of b |
603 preserving b for resolve of b |
585 preserving rev for resolve of rev |
604 preserving rev for resolve of rev |
586 a: remote is newer -> g |
605 a: remote is newer -> g |
587 getting a |
606 getting a |
588 b: both created -> m |
607 b: both created -> m (premerge) |
589 picked tool 'python ../merge' for b (binary False symlink False) |
608 picked tool 'python ../merge' for b (binary False symlink False) |
590 merging b |
609 merging b |
591 my b@86a2aa42fc76+ other b@8dbce441892a ancestor b@000000000000 |
610 my b@86a2aa42fc76+ other b@8dbce441892a ancestor b@000000000000 |
|
611 rev: versions differ -> m (premerge) |
|
612 picked tool 'python ../merge' for rev (binary False symlink False) |
|
613 merging rev |
|
614 my rev@86a2aa42fc76+ other rev@8dbce441892a ancestor rev@924404dff337 |
|
615 b: both created -> m (merge) |
592 picked tool 'python ../merge' for b (binary False symlink False) |
616 picked tool 'python ../merge' for b (binary False symlink False) |
593 my b@86a2aa42fc76+ other b@8dbce441892a ancestor b@000000000000 |
617 my b@86a2aa42fc76+ other b@8dbce441892a ancestor b@000000000000 |
594 launching merge tool: python ../merge *$TESTTMP/t/t/b* * * (glob) |
618 launching merge tool: python ../merge *$TESTTMP/t/t/b* * * (glob) |
595 merge tool returned: 0 |
619 merge tool returned: 0 |
596 rev: versions differ -> m |
620 rev: versions differ -> m (merge) |
597 picked tool 'python ../merge' for rev (binary False symlink False) |
621 picked tool 'python ../merge' for rev (binary False symlink False) |
598 merging rev |
|
599 my rev@86a2aa42fc76+ other rev@8dbce441892a ancestor rev@924404dff337 |
622 my rev@86a2aa42fc76+ other rev@8dbce441892a ancestor rev@924404dff337 |
600 picked tool 'python ../merge' for rev (binary False symlink False) |
|
601 my rev@86a2aa42fc76+ other rev@8dbce441892a ancestor rev@924404dff337 |
|
602 launching merge tool: python ../merge *$TESTTMP/t/t/rev* * * (glob) |
623 launching merge tool: python ../merge *$TESTTMP/t/t/rev* * * (glob) |
603 merge tool returned: 0 |
624 merge tool returned: 0 |
604 1 files updated, 2 files merged, 0 files removed, 0 files unresolved |
625 1 files updated, 2 files merged, 0 files removed, 0 files unresolved |
605 (branch merge, don't forget to commit) |
626 (branch merge, don't forget to commit) |
606 -------------- |
627 -------------- |
620 branchmerge: True, force: False, partial: False |
641 branchmerge: True, force: False, partial: False |
621 ancestor: 924404dff337, local: 0b76e65c8289+, remote: 4ce40f5aca24 |
642 ancestor: 924404dff337, local: 0b76e65c8289+, remote: 4ce40f5aca24 |
622 preserving b for resolve of b |
643 preserving b for resolve of b |
623 preserving rev for resolve of rev |
644 preserving rev for resolve of rev |
624 a: remote unchanged -> k |
645 a: remote unchanged -> k |
625 b: both created -> m |
646 b: both created -> m (premerge) |
626 picked tool 'python ../merge' for b (binary False symlink False) |
647 picked tool 'python ../merge' for b (binary False symlink False) |
627 merging b |
648 merging b |
628 my b@0b76e65c8289+ other b@4ce40f5aca24 ancestor b@000000000000 |
649 my b@0b76e65c8289+ other b@4ce40f5aca24 ancestor b@000000000000 |
|
650 rev: versions differ -> m (premerge) |
|
651 picked tool 'python ../merge' for rev (binary False symlink False) |
|
652 merging rev |
|
653 my rev@0b76e65c8289+ other rev@4ce40f5aca24 ancestor rev@924404dff337 |
|
654 b: both created -> m (merge) |
629 picked tool 'python ../merge' for b (binary False symlink False) |
655 picked tool 'python ../merge' for b (binary False symlink False) |
630 my b@0b76e65c8289+ other b@4ce40f5aca24 ancestor b@000000000000 |
656 my b@0b76e65c8289+ other b@4ce40f5aca24 ancestor b@000000000000 |
631 launching merge tool: python ../merge *$TESTTMP/t/t/b* * * (glob) |
657 launching merge tool: python ../merge *$TESTTMP/t/t/b* * * (glob) |
632 merge tool returned: 0 |
658 merge tool returned: 0 |
633 rev: versions differ -> m |
659 rev: versions differ -> m (merge) |
634 picked tool 'python ../merge' for rev (binary False symlink False) |
|
635 merging rev |
|
636 my rev@0b76e65c8289+ other rev@4ce40f5aca24 ancestor rev@924404dff337 |
|
637 picked tool 'python ../merge' for rev (binary False symlink False) |
660 picked tool 'python ../merge' for rev (binary False symlink False) |
638 my rev@0b76e65c8289+ other rev@4ce40f5aca24 ancestor rev@924404dff337 |
661 my rev@0b76e65c8289+ other rev@4ce40f5aca24 ancestor rev@924404dff337 |
639 launching merge tool: python ../merge *$TESTTMP/t/t/rev* * * (glob) |
662 launching merge tool: python ../merge *$TESTTMP/t/t/rev* * * (glob) |
640 merge tool returned: 0 |
663 merge tool returned: 0 |
641 0 files updated, 2 files merged, 0 files removed, 0 files unresolved |
664 0 files updated, 2 files merged, 0 files removed, 0 files unresolved |
660 use (c)hanged version or leave (d)eleted? c |
683 use (c)hanged version or leave (d)eleted? c |
661 preserving b for resolve of b |
684 preserving b for resolve of b |
662 preserving rev for resolve of rev |
685 preserving rev for resolve of rev |
663 a: prompt recreating -> g |
686 a: prompt recreating -> g |
664 getting a |
687 getting a |
665 b: both created -> m |
688 b: both created -> m (premerge) |
666 picked tool 'python ../merge' for b (binary False symlink False) |
689 picked tool 'python ../merge' for b (binary False symlink False) |
667 merging b |
690 merging b |
668 my b@02963e448370+ other b@8dbce441892a ancestor b@000000000000 |
691 my b@02963e448370+ other b@8dbce441892a ancestor b@000000000000 |
|
692 rev: versions differ -> m (premerge) |
|
693 picked tool 'python ../merge' for rev (binary False symlink False) |
|
694 merging rev |
|
695 my rev@02963e448370+ other rev@8dbce441892a ancestor rev@924404dff337 |
|
696 b: both created -> m (merge) |
669 picked tool 'python ../merge' for b (binary False symlink False) |
697 picked tool 'python ../merge' for b (binary False symlink False) |
670 my b@02963e448370+ other b@8dbce441892a ancestor b@000000000000 |
698 my b@02963e448370+ other b@8dbce441892a ancestor b@000000000000 |
671 launching merge tool: python ../merge *$TESTTMP/t/t/b* * * (glob) |
699 launching merge tool: python ../merge *$TESTTMP/t/t/b* * * (glob) |
672 merge tool returned: 0 |
700 merge tool returned: 0 |
673 rev: versions differ -> m |
701 rev: versions differ -> m (merge) |
674 picked tool 'python ../merge' for rev (binary False symlink False) |
|
675 merging rev |
|
676 my rev@02963e448370+ other rev@8dbce441892a ancestor rev@924404dff337 |
|
677 picked tool 'python ../merge' for rev (binary False symlink False) |
702 picked tool 'python ../merge' for rev (binary False symlink False) |
678 my rev@02963e448370+ other rev@8dbce441892a ancestor rev@924404dff337 |
703 my rev@02963e448370+ other rev@8dbce441892a ancestor rev@924404dff337 |
679 launching merge tool: python ../merge *$TESTTMP/t/t/rev* * * (glob) |
704 launching merge tool: python ../merge *$TESTTMP/t/t/rev* * * (glob) |
680 merge tool returned: 0 |
705 merge tool returned: 0 |
681 1 files updated, 2 files merged, 0 files removed, 0 files unresolved |
706 1 files updated, 2 files merged, 0 files removed, 0 files unresolved |
699 local changed a which remote deleted |
724 local changed a which remote deleted |
700 use (c)hanged version or (d)elete? c |
725 use (c)hanged version or (d)elete? c |
701 preserving b for resolve of b |
726 preserving b for resolve of b |
702 preserving rev for resolve of rev |
727 preserving rev for resolve of rev |
703 a: prompt keep -> a |
728 a: prompt keep -> a |
704 b: both created -> m |
729 b: both created -> m (premerge) |
705 picked tool 'python ../merge' for b (binary False symlink False) |
730 picked tool 'python ../merge' for b (binary False symlink False) |
706 merging b |
731 merging b |
707 my b@0b76e65c8289+ other b@bdb19105162a ancestor b@000000000000 |
732 my b@0b76e65c8289+ other b@bdb19105162a ancestor b@000000000000 |
|
733 rev: versions differ -> m (premerge) |
|
734 picked tool 'python ../merge' for rev (binary False symlink False) |
|
735 merging rev |
|
736 my rev@0b76e65c8289+ other rev@bdb19105162a ancestor rev@924404dff337 |
|
737 b: both created -> m (merge) |
708 picked tool 'python ../merge' for b (binary False symlink False) |
738 picked tool 'python ../merge' for b (binary False symlink False) |
709 my b@0b76e65c8289+ other b@bdb19105162a ancestor b@000000000000 |
739 my b@0b76e65c8289+ other b@bdb19105162a ancestor b@000000000000 |
710 launching merge tool: python ../merge *$TESTTMP/t/t/b* * * (glob) |
740 launching merge tool: python ../merge *$TESTTMP/t/t/b* * * (glob) |
711 merge tool returned: 0 |
741 merge tool returned: 0 |
712 rev: versions differ -> m |
742 rev: versions differ -> m (merge) |
713 picked tool 'python ../merge' for rev (binary False symlink False) |
|
714 merging rev |
|
715 my rev@0b76e65c8289+ other rev@bdb19105162a ancestor rev@924404dff337 |
|
716 picked tool 'python ../merge' for rev (binary False symlink False) |
743 picked tool 'python ../merge' for rev (binary False symlink False) |
717 my rev@0b76e65c8289+ other rev@bdb19105162a ancestor rev@924404dff337 |
744 my rev@0b76e65c8289+ other rev@bdb19105162a ancestor rev@924404dff337 |
718 launching merge tool: python ../merge *$TESTTMP/t/t/rev* * * (glob) |
745 launching merge tool: python ../merge *$TESTTMP/t/t/rev* * * (glob) |
719 merge tool returned: 0 |
746 merge tool returned: 0 |
720 0 files updated, 2 files merged, 0 files removed, 0 files unresolved |
747 0 files updated, 2 files merged, 0 files removed, 0 files unresolved |
739 branchmerge: True, force: False, partial: False |
766 branchmerge: True, force: False, partial: False |
740 ancestor: 924404dff337, local: e300d1c794ec+, remote: 49b6d8032493 |
767 ancestor: 924404dff337, local: e300d1c794ec+, remote: 49b6d8032493 |
741 preserving a for resolve of b |
768 preserving a for resolve of b |
742 preserving rev for resolve of rev |
769 preserving rev for resolve of rev |
743 removing a |
770 removing a |
744 b: remote moved from a -> m |
771 b: remote moved from a -> m (premerge) |
745 picked tool 'python ../merge' for b (binary False symlink False) |
772 picked tool 'python ../merge' for b (binary False symlink False) |
746 merging a and b to b |
773 merging a and b to b |
747 my b@e300d1c794ec+ other b@49b6d8032493 ancestor a@924404dff337 |
774 my b@e300d1c794ec+ other b@49b6d8032493 ancestor a@924404dff337 |
|
775 rev: versions differ -> m (premerge) |
|
776 picked tool 'python ../merge' for rev (binary False symlink False) |
|
777 merging rev |
|
778 my rev@e300d1c794ec+ other rev@49b6d8032493 ancestor rev@924404dff337 |
|
779 b: remote moved from a -> m (merge) |
748 picked tool 'python ../merge' for b (binary False symlink False) |
780 picked tool 'python ../merge' for b (binary False symlink False) |
749 my b@e300d1c794ec+ other b@49b6d8032493 ancestor a@924404dff337 |
781 my b@e300d1c794ec+ other b@49b6d8032493 ancestor a@924404dff337 |
750 launching merge tool: python ../merge *$TESTTMP/t/t/b* * * (glob) |
782 launching merge tool: python ../merge *$TESTTMP/t/t/b* * * (glob) |
751 merge tool returned: 0 |
783 merge tool returned: 0 |
752 rev: versions differ -> m |
784 rev: versions differ -> m (merge) |
753 picked tool 'python ../merge' for rev (binary False symlink False) |
785 picked tool 'python ../merge' for rev (binary False symlink False) |
754 merging rev |
|
755 my rev@e300d1c794ec+ other rev@49b6d8032493 ancestor rev@924404dff337 |
786 my rev@e300d1c794ec+ other rev@49b6d8032493 ancestor rev@924404dff337 |
756 picked tool 'python ../merge' for rev (binary False symlink False) |
|
757 my rev@e300d1c794ec+ other rev@49b6d8032493 ancestor rev@924404dff337 |
|
758 launching merge tool: python ../merge *$TESTTMP/t/t/rev* * * (glob) |
787 launching merge tool: python ../merge *$TESTTMP/t/t/rev* * * (glob) |
759 merge tool returned: 0 |
788 merge tool returned: 0 |
760 0 files updated, 2 files merged, 0 files removed, 0 files unresolved |
789 0 files updated, 2 files merged, 0 files removed, 0 files unresolved |
761 (branch merge, don't forget to commit) |
790 (branch merge, don't forget to commit) |
762 -------------- |
791 -------------- |
778 resolving manifests |
807 resolving manifests |
779 branchmerge: True, force: False, partial: False |
808 branchmerge: True, force: False, partial: False |
780 ancestor: 924404dff337, local: 62e7bf090eba+, remote: f4db7e329e71 |
809 ancestor: 924404dff337, local: 62e7bf090eba+, remote: f4db7e329e71 |
781 preserving b for resolve of b |
810 preserving b for resolve of b |
782 preserving rev for resolve of rev |
811 preserving rev for resolve of rev |
783 b: local copied/moved from a -> m |
812 b: local copied/moved from a -> m (premerge) |
784 picked tool 'python ../merge' for b (binary False symlink False) |
813 picked tool 'python ../merge' for b (binary False symlink False) |
785 merging b and a to b |
814 merging b and a to b |
786 my b@62e7bf090eba+ other a@f4db7e329e71 ancestor a@924404dff337 |
815 my b@62e7bf090eba+ other a@f4db7e329e71 ancestor a@924404dff337 |
|
816 rev: versions differ -> m (premerge) |
|
817 picked tool 'python ../merge' for rev (binary False symlink False) |
|
818 merging rev |
|
819 my rev@62e7bf090eba+ other rev@f4db7e329e71 ancestor rev@924404dff337 |
|
820 b: local copied/moved from a -> m (merge) |
787 picked tool 'python ../merge' for b (binary False symlink False) |
821 picked tool 'python ../merge' for b (binary False symlink False) |
788 my b@62e7bf090eba+ other a@f4db7e329e71 ancestor a@924404dff337 |
822 my b@62e7bf090eba+ other a@f4db7e329e71 ancestor a@924404dff337 |
789 launching merge tool: python ../merge *$TESTTMP/t/t/b* * * (glob) |
823 launching merge tool: python ../merge *$TESTTMP/t/t/b* * * (glob) |
790 merge tool returned: 0 |
824 merge tool returned: 0 |
791 rev: versions differ -> m |
825 rev: versions differ -> m (merge) |
792 picked tool 'python ../merge' for rev (binary False symlink False) |
|
793 merging rev |
|
794 my rev@62e7bf090eba+ other rev@f4db7e329e71 ancestor rev@924404dff337 |
|
795 picked tool 'python ../merge' for rev (binary False symlink False) |
826 picked tool 'python ../merge' for rev (binary False symlink False) |
796 my rev@62e7bf090eba+ other rev@f4db7e329e71 ancestor rev@924404dff337 |
827 my rev@62e7bf090eba+ other rev@f4db7e329e71 ancestor rev@924404dff337 |
797 launching merge tool: python ../merge *$TESTTMP/t/t/rev* * * (glob) |
828 launching merge tool: python ../merge *$TESTTMP/t/t/rev* * * (glob) |
798 merge tool returned: 0 |
829 merge tool returned: 0 |
799 0 files updated, 2 files merged, 0 files removed, 0 files unresolved |
830 0 files updated, 2 files merged, 0 files removed, 0 files unresolved |
824 ancestor: 924404dff337, local: 02963e448370+, remote: 2b958612230f |
855 ancestor: 924404dff337, local: 02963e448370+, remote: 2b958612230f |
825 preserving b for resolve of b |
856 preserving b for resolve of b |
826 preserving rev for resolve of rev |
857 preserving rev for resolve of rev |
827 c: remote created -> g |
858 c: remote created -> g |
828 getting c |
859 getting c |
829 b: local copied/moved from a -> m |
860 b: local copied/moved from a -> m (premerge) |
830 picked tool 'python ../merge' for b (binary False symlink False) |
861 picked tool 'python ../merge' for b (binary False symlink False) |
831 merging b and a to b |
862 merging b and a to b |
832 my b@02963e448370+ other a@2b958612230f ancestor a@924404dff337 |
863 my b@02963e448370+ other a@2b958612230f ancestor a@924404dff337 |
833 premerge successful |
864 premerge successful |
834 rev: versions differ -> m |
865 rev: versions differ -> m (premerge) |
835 picked tool 'python ../merge' for rev (binary False symlink False) |
866 picked tool 'python ../merge' for rev (binary False symlink False) |
836 merging rev |
867 merging rev |
837 my rev@02963e448370+ other rev@2b958612230f ancestor rev@924404dff337 |
868 my rev@02963e448370+ other rev@2b958612230f ancestor rev@924404dff337 |
|
869 rev: versions differ -> m (merge) |
838 picked tool 'python ../merge' for rev (binary False symlink False) |
870 picked tool 'python ../merge' for rev (binary False symlink False) |
839 my rev@02963e448370+ other rev@2b958612230f ancestor rev@924404dff337 |
871 my rev@02963e448370+ other rev@2b958612230f ancestor rev@924404dff337 |
840 launching merge tool: python ../merge *$TESTTMP/t/t/rev* * * (glob) |
872 launching merge tool: python ../merge *$TESTTMP/t/t/rev* * * (glob) |
841 merge tool returned: 0 |
873 merge tool returned: 0 |
842 1 files updated, 2 files merged, 0 files removed, 0 files unresolved |
874 1 files updated, 2 files merged, 0 files removed, 0 files unresolved |