98 rev: versions differ -> m |
98 rev: versions differ -> m |
99 updating: rev 2/2 files (100.00%) |
99 updating: rev 2/2 files (100.00%) |
100 picked tool 'python ../merge' for rev (binary False symlink False) |
100 picked tool 'python ../merge' for rev (binary False symlink False) |
101 merging rev |
101 merging rev |
102 my rev@e300d1c794ec+ other rev@4ce40f5aca24 ancestor rev@924404dff337 |
102 my rev@e300d1c794ec+ other rev@4ce40f5aca24 ancestor rev@924404dff337 |
103 launching merge tool: python ../merge $TESTTMP/t/t/rev * * (glob) |
103 launching merge tool: python ../merge *$TESTTMP/t/t/rev* * * (glob) |
104 merge tool returned: 0 |
104 merge tool returned: 0 |
105 0 files updated, 2 files merged, 0 files removed, 0 files unresolved |
105 0 files updated, 2 files merged, 0 files removed, 0 files unresolved |
106 (branch merge, don't forget to commit) |
106 (branch merge, don't forget to commit) |
107 -------------- |
107 -------------- |
108 M b |
108 M b |
138 rev: versions differ -> m |
138 rev: versions differ -> m |
139 updating: rev 3/3 files (100.00%) |
139 updating: rev 3/3 files (100.00%) |
140 picked tool 'python ../merge' for rev (binary False symlink False) |
140 picked tool 'python ../merge' for rev (binary False symlink False) |
141 merging rev |
141 merging rev |
142 my rev@86a2aa42fc76+ other rev@f4db7e329e71 ancestor rev@924404dff337 |
142 my rev@86a2aa42fc76+ other rev@f4db7e329e71 ancestor rev@924404dff337 |
143 launching merge tool: python ../merge $TESTTMP/t/t/rev * (glob) |
143 launching merge tool: python ../merge *$TESTTMP/t/t/rev* * (glob) |
144 merge tool returned: 0 |
144 merge tool returned: 0 |
145 1 files updated, 2 files merged, 0 files removed, 0 files unresolved |
145 1 files updated, 2 files merged, 0 files removed, 0 files unresolved |
146 (branch merge, don't forget to commit) |
146 (branch merge, don't forget to commit) |
147 -------------- |
147 -------------- |
148 M a |
148 M a |
176 rev: versions differ -> m |
176 rev: versions differ -> m |
177 updating: rev 2/2 files (100.00%) |
177 updating: rev 2/2 files (100.00%) |
178 picked tool 'python ../merge' for rev (binary False symlink False) |
178 picked tool 'python ../merge' for rev (binary False symlink False) |
179 merging rev |
179 merging rev |
180 my rev@e300d1c794ec+ other rev@bdb19105162a ancestor rev@924404dff337 |
180 my rev@e300d1c794ec+ other rev@bdb19105162a ancestor rev@924404dff337 |
181 launching merge tool: python ../merge $TESTTMP/t/t/rev * * (glob) |
181 launching merge tool: python ../merge *$TESTTMP/t/t/rev* * * (glob) |
182 merge tool returned: 0 |
182 merge tool returned: 0 |
183 0 files updated, 2 files merged, 0 files removed, 0 files unresolved |
183 0 files updated, 2 files merged, 0 files removed, 0 files unresolved |
184 (branch merge, don't forget to commit) |
184 (branch merge, don't forget to commit) |
185 -------------- |
185 -------------- |
186 M b |
186 M b |
212 rev: versions differ -> m |
212 rev: versions differ -> m |
213 updating: rev 2/2 files (100.00%) |
213 updating: rev 2/2 files (100.00%) |
214 picked tool 'python ../merge' for rev (binary False symlink False) |
214 picked tool 'python ../merge' for rev (binary False symlink False) |
215 merging rev |
215 merging rev |
216 my rev@02963e448370+ other rev@f4db7e329e71 ancestor rev@924404dff337 |
216 my rev@02963e448370+ other rev@f4db7e329e71 ancestor rev@924404dff337 |
217 launching merge tool: python ../merge $TESTTMP/t/t/rev * * (glob) |
217 launching merge tool: python ../merge *$TESTTMP/t/t/rev* * * (glob) |
218 merge tool returned: 0 |
218 merge tool returned: 0 |
219 0 files updated, 2 files merged, 0 files removed, 0 files unresolved |
219 0 files updated, 2 files merged, 0 files removed, 0 files unresolved |
220 (branch merge, don't forget to commit) |
220 (branch merge, don't forget to commit) |
221 -------------- |
221 -------------- |
222 M b |
222 M b |
244 rev: versions differ -> m |
244 rev: versions differ -> m |
245 updating: rev 2/2 files (100.00%) |
245 updating: rev 2/2 files (100.00%) |
246 picked tool 'python ../merge' for rev (binary False symlink False) |
246 picked tool 'python ../merge' for rev (binary False symlink False) |
247 merging rev |
247 merging rev |
248 my rev@94b33a1b7f2d+ other rev@4ce40f5aca24 ancestor rev@924404dff337 |
248 my rev@94b33a1b7f2d+ other rev@4ce40f5aca24 ancestor rev@924404dff337 |
249 launching merge tool: python ../merge $TESTTMP/t/t/rev * * (glob) |
249 launching merge tool: python ../merge *$TESTTMP/t/t/rev* * * (glob) |
250 merge tool returned: 0 |
250 merge tool returned: 0 |
251 1 files updated, 1 files merged, 0 files removed, 0 files unresolved |
251 1 files updated, 1 files merged, 0 files removed, 0 files unresolved |
252 (branch merge, don't forget to commit) |
252 (branch merge, don't forget to commit) |
253 -------------- |
253 -------------- |
254 M b |
254 M b |
273 rev: versions differ -> m |
273 rev: versions differ -> m |
274 updating: rev 1/1 files (100.00%) |
274 updating: rev 1/1 files (100.00%) |
275 picked tool 'python ../merge' for rev (binary False symlink False) |
275 picked tool 'python ../merge' for rev (binary False symlink False) |
276 merging rev |
276 merging rev |
277 my rev@86a2aa42fc76+ other rev@97c705ade336 ancestor rev@924404dff337 |
277 my rev@86a2aa42fc76+ other rev@97c705ade336 ancestor rev@924404dff337 |
278 launching merge tool: python ../merge $TESTTMP/t/t/rev * * (glob) |
278 launching merge tool: python ../merge *$TESTTMP/t/t/rev* * * (glob) |
279 merge tool returned: 0 |
279 merge tool returned: 0 |
280 0 files updated, 1 files merged, 0 files removed, 0 files unresolved |
280 0 files updated, 1 files merged, 0 files removed, 0 files unresolved |
281 (branch merge, don't forget to commit) |
281 (branch merge, don't forget to commit) |
282 -------------- |
282 -------------- |
283 C a |
283 C a |
308 rev: versions differ -> m |
308 rev: versions differ -> m |
309 updating: rev 3/3 files (100.00%) |
309 updating: rev 3/3 files (100.00%) |
310 picked tool 'python ../merge' for rev (binary False symlink False) |
310 picked tool 'python ../merge' for rev (binary False symlink False) |
311 merging rev |
311 merging rev |
312 my rev@94b33a1b7f2d+ other rev@bdb19105162a ancestor rev@924404dff337 |
312 my rev@94b33a1b7f2d+ other rev@bdb19105162a ancestor rev@924404dff337 |
313 launching merge tool: python ../merge $TESTTMP/t/t/rev * * (glob) |
313 launching merge tool: python ../merge *$TESTTMP/t/t/rev* * * (glob) |
314 merge tool returned: 0 |
314 merge tool returned: 0 |
315 1 files updated, 1 files merged, 1 files removed, 0 files unresolved |
315 1 files updated, 1 files merged, 1 files removed, 0 files unresolved |
316 (branch merge, don't forget to commit) |
316 (branch merge, don't forget to commit) |
317 -------------- |
317 -------------- |
318 M b |
318 M b |
336 rev: versions differ -> m |
336 rev: versions differ -> m |
337 updating: rev 1/1 files (100.00%) |
337 updating: rev 1/1 files (100.00%) |
338 picked tool 'python ../merge' for rev (binary False symlink False) |
338 picked tool 'python ../merge' for rev (binary False symlink False) |
339 merging rev |
339 merging rev |
340 my rev@02963e448370+ other rev@97c705ade336 ancestor rev@924404dff337 |
340 my rev@02963e448370+ other rev@97c705ade336 ancestor rev@924404dff337 |
341 launching merge tool: python ../merge $TESTTMP/t/t/rev * * (glob) |
341 launching merge tool: python ../merge *$TESTTMP/t/t/rev* * * (glob) |
342 merge tool returned: 0 |
342 merge tool returned: 0 |
343 0 files updated, 1 files merged, 0 files removed, 0 files unresolved |
343 0 files updated, 1 files merged, 0 files removed, 0 files unresolved |
344 (branch merge, don't forget to commit) |
344 (branch merge, don't forget to commit) |
345 -------------- |
345 -------------- |
346 C b |
346 C b |
362 b: both renamed from a -> m |
362 b: both renamed from a -> m |
363 updating: b 1/2 files (50.00%) |
363 updating: b 1/2 files (50.00%) |
364 picked tool 'python ../merge' for b (binary False symlink False) |
364 picked tool 'python ../merge' for b (binary False symlink False) |
365 merging b |
365 merging b |
366 my b@62e7bf090eba+ other b@49b6d8032493 ancestor a@924404dff337 |
366 my b@62e7bf090eba+ other b@49b6d8032493 ancestor a@924404dff337 |
367 launching merge tool: python ../merge $TESTTMP/t/t/b * * (glob) |
367 launching merge tool: python ../merge *$TESTTMP/t/t/b* * * (glob) |
368 merge tool returned: 0 |
368 merge tool returned: 0 |
369 rev: versions differ -> m |
369 rev: versions differ -> m |
370 updating: rev 2/2 files (100.00%) |
370 updating: rev 2/2 files (100.00%) |
371 picked tool 'python ../merge' for rev (binary False symlink False) |
371 picked tool 'python ../merge' for rev (binary False symlink False) |
372 merging rev |
372 merging rev |
373 my rev@62e7bf090eba+ other rev@49b6d8032493 ancestor rev@924404dff337 |
373 my rev@62e7bf090eba+ other rev@49b6d8032493 ancestor rev@924404dff337 |
374 launching merge tool: python ../merge $TESTTMP/t/t/rev * * (glob) |
374 launching merge tool: python ../merge *$TESTTMP/t/t/rev* * * (glob) |
375 merge tool returned: 0 |
375 merge tool returned: 0 |
376 0 files updated, 2 files merged, 0 files removed, 0 files unresolved |
376 0 files updated, 2 files merged, 0 files removed, 0 files unresolved |
377 (branch merge, don't forget to commit) |
377 (branch merge, don't forget to commit) |
378 -------------- |
378 -------------- |
379 M b |
379 M b |
406 rev: versions differ -> m |
406 rev: versions differ -> m |
407 updating: rev 2/2 files (100.00%) |
407 updating: rev 2/2 files (100.00%) |
408 picked tool 'python ../merge' for rev (binary False symlink False) |
408 picked tool 'python ../merge' for rev (binary False symlink False) |
409 merging rev |
409 merging rev |
410 my rev@02963e448370+ other rev@fe905ef2c33e ancestor rev@924404dff337 |
410 my rev@02963e448370+ other rev@fe905ef2c33e ancestor rev@924404dff337 |
411 launching merge tool: python ../merge $TESTTMP/t/t/rev * * (glob) |
411 launching merge tool: python ../merge *$TESTTMP/t/t/rev* * * (glob) |
412 merge tool returned: 0 |
412 merge tool returned: 0 |
413 note: possible conflict - a was renamed multiple times to: |
413 note: possible conflict - a was renamed multiple times to: |
414 b |
414 b |
415 c |
415 c |
416 1 files updated, 1 files merged, 0 files removed, 0 files unresolved |
416 1 files updated, 1 files merged, 0 files removed, 0 files unresolved |
436 b: both created -> m |
436 b: both created -> m |
437 updating: b 1/2 files (50.00%) |
437 updating: b 1/2 files (50.00%) |
438 picked tool 'python ../merge' for b (binary False symlink False) |
438 picked tool 'python ../merge' for b (binary False symlink False) |
439 merging b |
439 merging b |
440 my b@86a2aa42fc76+ other b@af30c7647fc7 ancestor b@000000000000 |
440 my b@86a2aa42fc76+ other b@af30c7647fc7 ancestor b@000000000000 |
441 launching merge tool: python ../merge $TESTTMP/t/t/b * * (glob) |
441 launching merge tool: python ../merge *$TESTTMP/t/t/b* * * (glob) |
442 merge tool returned: 0 |
442 merge tool returned: 0 |
443 rev: versions differ -> m |
443 rev: versions differ -> m |
444 updating: rev 2/2 files (100.00%) |
444 updating: rev 2/2 files (100.00%) |
445 picked tool 'python ../merge' for rev (binary False symlink False) |
445 picked tool 'python ../merge' for rev (binary False symlink False) |
446 merging rev |
446 merging rev |
447 my rev@86a2aa42fc76+ other rev@af30c7647fc7 ancestor rev@924404dff337 |
447 my rev@86a2aa42fc76+ other rev@af30c7647fc7 ancestor rev@924404dff337 |
448 launching merge tool: python ../merge $TESTTMP/t/t/rev * * (glob) |
448 launching merge tool: python ../merge *$TESTTMP/t/t/rev* * * (glob) |
449 merge tool returned: 0 |
449 merge tool returned: 0 |
450 0 files updated, 2 files merged, 0 files removed, 0 files unresolved |
450 0 files updated, 2 files merged, 0 files removed, 0 files unresolved |
451 (branch merge, don't forget to commit) |
451 (branch merge, don't forget to commit) |
452 -------------- |
452 -------------- |
453 M b |
453 M b |
473 b: both created -> m |
473 b: both created -> m |
474 updating: b 2/3 files (66.67%) |
474 updating: b 2/3 files (66.67%) |
475 picked tool 'python ../merge' for b (binary False symlink False) |
475 picked tool 'python ../merge' for b (binary False symlink False) |
476 merging b |
476 merging b |
477 my b@59318016310c+ other b@bdb19105162a ancestor b@000000000000 |
477 my b@59318016310c+ other b@bdb19105162a ancestor b@000000000000 |
478 launching merge tool: python ../merge $TESTTMP/t/t/b * * (glob) |
478 launching merge tool: python ../merge *$TESTTMP/t/t/b* * * (glob) |
479 merge tool returned: 0 |
479 merge tool returned: 0 |
480 rev: versions differ -> m |
480 rev: versions differ -> m |
481 updating: rev 3/3 files (100.00%) |
481 updating: rev 3/3 files (100.00%) |
482 picked tool 'python ../merge' for rev (binary False symlink False) |
482 picked tool 'python ../merge' for rev (binary False symlink False) |
483 merging rev |
483 merging rev |
484 my rev@59318016310c+ other rev@bdb19105162a ancestor rev@924404dff337 |
484 my rev@59318016310c+ other rev@bdb19105162a ancestor rev@924404dff337 |
485 launching merge tool: python ../merge $TESTTMP/t/t/rev * * (glob) |
485 launching merge tool: python ../merge *$TESTTMP/t/t/rev* * * (glob) |
486 merge tool returned: 0 |
486 merge tool returned: 0 |
487 0 files updated, 2 files merged, 1 files removed, 0 files unresolved |
487 0 files updated, 2 files merged, 1 files removed, 0 files unresolved |
488 (branch merge, don't forget to commit) |
488 (branch merge, don't forget to commit) |
489 -------------- |
489 -------------- |
490 M b |
490 M b |
509 b: both created -> m |
509 b: both created -> m |
510 updating: b 2/3 files (66.67%) |
510 updating: b 2/3 files (66.67%) |
511 picked tool 'python ../merge' for b (binary False symlink False) |
511 picked tool 'python ../merge' for b (binary False symlink False) |
512 merging b |
512 merging b |
513 my b@86a2aa42fc76+ other b@8dbce441892a ancestor b@000000000000 |
513 my b@86a2aa42fc76+ other b@8dbce441892a ancestor b@000000000000 |
514 launching merge tool: python ../merge $TESTTMP/t/t/b * * (glob) |
514 launching merge tool: python ../merge *$TESTTMP/t/t/b* * * (glob) |
515 merge tool returned: 0 |
515 merge tool returned: 0 |
516 rev: versions differ -> m |
516 rev: versions differ -> m |
517 updating: rev 3/3 files (100.00%) |
517 updating: rev 3/3 files (100.00%) |
518 picked tool 'python ../merge' for rev (binary False symlink False) |
518 picked tool 'python ../merge' for rev (binary False symlink False) |
519 merging rev |
519 merging rev |
520 my rev@86a2aa42fc76+ other rev@8dbce441892a ancestor rev@924404dff337 |
520 my rev@86a2aa42fc76+ other rev@8dbce441892a ancestor rev@924404dff337 |
521 launching merge tool: python ../merge $TESTTMP/t/t/rev * * (glob) |
521 launching merge tool: python ../merge *$TESTTMP/t/t/rev* * * (glob) |
522 merge tool returned: 0 |
522 merge tool returned: 0 |
523 1 files updated, 2 files merged, 0 files removed, 0 files unresolved |
523 1 files updated, 2 files merged, 0 files removed, 0 files unresolved |
524 (branch merge, don't forget to commit) |
524 (branch merge, don't forget to commit) |
525 -------------- |
525 -------------- |
526 M a |
526 M a |
546 b: both created -> m |
546 b: both created -> m |
547 updating: b 2/3 files (66.67%) |
547 updating: b 2/3 files (66.67%) |
548 picked tool 'python ../merge' for b (binary False symlink False) |
548 picked tool 'python ../merge' for b (binary False symlink False) |
549 merging b |
549 merging b |
550 my b@59318016310c+ other b@bdb19105162a ancestor b@000000000000 |
550 my b@59318016310c+ other b@bdb19105162a ancestor b@000000000000 |
551 launching merge tool: python ../merge $TESTTMP/t/t/b * * (glob) |
551 launching merge tool: python ../merge *$TESTTMP/t/t/b* * * (glob) |
552 merge tool returned: 0 |
552 merge tool returned: 0 |
553 rev: versions differ -> m |
553 rev: versions differ -> m |
554 updating: rev 3/3 files (100.00%) |
554 updating: rev 3/3 files (100.00%) |
555 picked tool 'python ../merge' for rev (binary False symlink False) |
555 picked tool 'python ../merge' for rev (binary False symlink False) |
556 merging rev |
556 merging rev |
557 my rev@59318016310c+ other rev@bdb19105162a ancestor rev@924404dff337 |
557 my rev@59318016310c+ other rev@bdb19105162a ancestor rev@924404dff337 |
558 launching merge tool: python ../merge $TESTTMP/t/t/rev * * (glob) |
558 launching merge tool: python ../merge *$TESTTMP/t/t/rev* * * (glob) |
559 merge tool returned: 0 |
559 merge tool returned: 0 |
560 0 files updated, 2 files merged, 1 files removed, 0 files unresolved |
560 0 files updated, 2 files merged, 1 files removed, 0 files unresolved |
561 (branch merge, don't forget to commit) |
561 (branch merge, don't forget to commit) |
562 -------------- |
562 -------------- |
563 M b |
563 M b |
582 b: both created -> m |
582 b: both created -> m |
583 updating: b 2/3 files (66.67%) |
583 updating: b 2/3 files (66.67%) |
584 picked tool 'python ../merge' for b (binary False symlink False) |
584 picked tool 'python ../merge' for b (binary False symlink False) |
585 merging b |
585 merging b |
586 my b@86a2aa42fc76+ other b@8dbce441892a ancestor b@000000000000 |
586 my b@86a2aa42fc76+ other b@8dbce441892a ancestor b@000000000000 |
587 launching merge tool: python ../merge $TESTTMP/t/t/b * * (glob) |
587 launching merge tool: python ../merge *$TESTTMP/t/t/b* * * (glob) |
588 merge tool returned: 0 |
588 merge tool returned: 0 |
589 rev: versions differ -> m |
589 rev: versions differ -> m |
590 updating: rev 3/3 files (100.00%) |
590 updating: rev 3/3 files (100.00%) |
591 picked tool 'python ../merge' for rev (binary False symlink False) |
591 picked tool 'python ../merge' for rev (binary False symlink False) |
592 merging rev |
592 merging rev |
593 my rev@86a2aa42fc76+ other rev@8dbce441892a ancestor rev@924404dff337 |
593 my rev@86a2aa42fc76+ other rev@8dbce441892a ancestor rev@924404dff337 |
594 launching merge tool: python ../merge $TESTTMP/t/t/rev * * (glob) |
594 launching merge tool: python ../merge *$TESTTMP/t/t/rev* * * (glob) |
595 merge tool returned: 0 |
595 merge tool returned: 0 |
596 1 files updated, 2 files merged, 0 files removed, 0 files unresolved |
596 1 files updated, 2 files merged, 0 files removed, 0 files unresolved |
597 (branch merge, don't forget to commit) |
597 (branch merge, don't forget to commit) |
598 -------------- |
598 -------------- |
599 M a |
599 M a |
617 b: both created -> m |
617 b: both created -> m |
618 updating: b 1/2 files (50.00%) |
618 updating: b 1/2 files (50.00%) |
619 picked tool 'python ../merge' for b (binary False symlink False) |
619 picked tool 'python ../merge' for b (binary False symlink False) |
620 merging b |
620 merging b |
621 my b@0b76e65c8289+ other b@4ce40f5aca24 ancestor b@000000000000 |
621 my b@0b76e65c8289+ other b@4ce40f5aca24 ancestor b@000000000000 |
622 launching merge tool: python ../merge $TESTTMP/t/t/b * * (glob) |
622 launching merge tool: python ../merge *$TESTTMP/t/t/b* * * (glob) |
623 merge tool returned: 0 |
623 merge tool returned: 0 |
624 rev: versions differ -> m |
624 rev: versions differ -> m |
625 updating: rev 2/2 files (100.00%) |
625 updating: rev 2/2 files (100.00%) |
626 picked tool 'python ../merge' for rev (binary False symlink False) |
626 picked tool 'python ../merge' for rev (binary False symlink False) |
627 merging rev |
627 merging rev |
628 my rev@0b76e65c8289+ other rev@4ce40f5aca24 ancestor rev@924404dff337 |
628 my rev@0b76e65c8289+ other rev@4ce40f5aca24 ancestor rev@924404dff337 |
629 launching merge tool: python ../merge $TESTTMP/t/t/rev * * (glob) |
629 launching merge tool: python ../merge *$TESTTMP/t/t/rev* * * (glob) |
630 merge tool returned: 0 |
630 merge tool returned: 0 |
631 0 files updated, 2 files merged, 0 files removed, 0 files unresolved |
631 0 files updated, 2 files merged, 0 files removed, 0 files unresolved |
632 (branch merge, don't forget to commit) |
632 (branch merge, don't forget to commit) |
633 -------------- |
633 -------------- |
634 M b |
634 M b |
656 b: both created -> m |
656 b: both created -> m |
657 updating: b 2/3 files (66.67%) |
657 updating: b 2/3 files (66.67%) |
658 picked tool 'python ../merge' for b (binary False symlink False) |
658 picked tool 'python ../merge' for b (binary False symlink False) |
659 merging b |
659 merging b |
660 my b@02963e448370+ other b@8dbce441892a ancestor b@000000000000 |
660 my b@02963e448370+ other b@8dbce441892a ancestor b@000000000000 |
661 launching merge tool: python ../merge $TESTTMP/t/t/b * * (glob) |
661 launching merge tool: python ../merge *$TESTTMP/t/t/b* * * (glob) |
662 merge tool returned: 0 |
662 merge tool returned: 0 |
663 rev: versions differ -> m |
663 rev: versions differ -> m |
664 updating: rev 3/3 files (100.00%) |
664 updating: rev 3/3 files (100.00%) |
665 picked tool 'python ../merge' for rev (binary False symlink False) |
665 picked tool 'python ../merge' for rev (binary False symlink False) |
666 merging rev |
666 merging rev |
667 my rev@02963e448370+ other rev@8dbce441892a ancestor rev@924404dff337 |
667 my rev@02963e448370+ other rev@8dbce441892a ancestor rev@924404dff337 |
668 launching merge tool: python ../merge $TESTTMP/t/t/rev * * (glob) |
668 launching merge tool: python ../merge *$TESTTMP/t/t/rev* * * (glob) |
669 merge tool returned: 0 |
669 merge tool returned: 0 |
670 1 files updated, 2 files merged, 0 files removed, 0 files unresolved |
670 1 files updated, 2 files merged, 0 files removed, 0 files unresolved |
671 (branch merge, don't forget to commit) |
671 (branch merge, don't forget to commit) |
672 -------------- |
672 -------------- |
673 M a |
673 M a |
694 b: both created -> m |
694 b: both created -> m |
695 updating: b 2/3 files (66.67%) |
695 updating: b 2/3 files (66.67%) |
696 picked tool 'python ../merge' for b (binary False symlink False) |
696 picked tool 'python ../merge' for b (binary False symlink False) |
697 merging b |
697 merging b |
698 my b@0b76e65c8289+ other b@bdb19105162a ancestor b@000000000000 |
698 my b@0b76e65c8289+ other b@bdb19105162a ancestor b@000000000000 |
699 launching merge tool: python ../merge $TESTTMP/t/t/b * * (glob) |
699 launching merge tool: python ../merge *$TESTTMP/t/t/b* * * (glob) |
700 merge tool returned: 0 |
700 merge tool returned: 0 |
701 rev: versions differ -> m |
701 rev: versions differ -> m |
702 updating: rev 3/3 files (100.00%) |
702 updating: rev 3/3 files (100.00%) |
703 picked tool 'python ../merge' for rev (binary False symlink False) |
703 picked tool 'python ../merge' for rev (binary False symlink False) |
704 merging rev |
704 merging rev |
705 my rev@0b76e65c8289+ other rev@bdb19105162a ancestor rev@924404dff337 |
705 my rev@0b76e65c8289+ other rev@bdb19105162a ancestor rev@924404dff337 |
706 launching merge tool: python ../merge $TESTTMP/t/t/rev * * (glob) |
706 launching merge tool: python ../merge *$TESTTMP/t/t/rev* * * (glob) |
707 merge tool returned: 0 |
707 merge tool returned: 0 |
708 0 files updated, 2 files merged, 0 files removed, 0 files unresolved |
708 0 files updated, 2 files merged, 0 files removed, 0 files unresolved |
709 (branch merge, don't forget to commit) |
709 (branch merge, don't forget to commit) |
710 -------------- |
710 -------------- |
711 M b |
711 M b |
732 b: remote moved from a -> m |
732 b: remote moved from a -> m |
733 updating: b 1/2 files (50.00%) |
733 updating: b 1/2 files (50.00%) |
734 picked tool 'python ../merge' for b (binary False symlink False) |
734 picked tool 'python ../merge' for b (binary False symlink False) |
735 merging a and b to b |
735 merging a and b to b |
736 my b@e300d1c794ec+ other b@49b6d8032493 ancestor a@924404dff337 |
736 my b@e300d1c794ec+ other b@49b6d8032493 ancestor a@924404dff337 |
737 launching merge tool: python ../merge $TESTTMP/t/t/b * * (glob) |
737 launching merge tool: python ../merge *$TESTTMP/t/t/b* * * (glob) |
738 merge tool returned: 0 |
738 merge tool returned: 0 |
739 rev: versions differ -> m |
739 rev: versions differ -> m |
740 updating: rev 2/2 files (100.00%) |
740 updating: rev 2/2 files (100.00%) |
741 picked tool 'python ../merge' for rev (binary False symlink False) |
741 picked tool 'python ../merge' for rev (binary False symlink False) |
742 merging rev |
742 merging rev |
743 my rev@e300d1c794ec+ other rev@49b6d8032493 ancestor rev@924404dff337 |
743 my rev@e300d1c794ec+ other rev@49b6d8032493 ancestor rev@924404dff337 |
744 launching merge tool: python ../merge $TESTTMP/t/t/rev * * (glob) |
744 launching merge tool: python ../merge *$TESTTMP/t/t/rev* * * (glob) |
745 merge tool returned: 0 |
745 merge tool returned: 0 |
746 0 files updated, 2 files merged, 0 files removed, 0 files unresolved |
746 0 files updated, 2 files merged, 0 files removed, 0 files unresolved |
747 (branch merge, don't forget to commit) |
747 (branch merge, don't forget to commit) |
748 -------------- |
748 -------------- |
749 M b |
749 M b |
769 b: local copied/moved from a -> m |
769 b: local copied/moved from a -> m |
770 updating: b 1/2 files (50.00%) |
770 updating: b 1/2 files (50.00%) |
771 picked tool 'python ../merge' for b (binary False symlink False) |
771 picked tool 'python ../merge' for b (binary False symlink False) |
772 merging b and a to b |
772 merging b and a to b |
773 my b@62e7bf090eba+ other a@f4db7e329e71 ancestor a@924404dff337 |
773 my b@62e7bf090eba+ other a@f4db7e329e71 ancestor a@924404dff337 |
774 launching merge tool: python ../merge $TESTTMP/t/t/b * * (glob) |
774 launching merge tool: python ../merge *$TESTTMP/t/t/b* * * (glob) |
775 merge tool returned: 0 |
775 merge tool returned: 0 |
776 rev: versions differ -> m |
776 rev: versions differ -> m |
777 updating: rev 2/2 files (100.00%) |
777 updating: rev 2/2 files (100.00%) |
778 picked tool 'python ../merge' for rev (binary False symlink False) |
778 picked tool 'python ../merge' for rev (binary False symlink False) |
779 merging rev |
779 merging rev |
780 my rev@62e7bf090eba+ other rev@f4db7e329e71 ancestor rev@924404dff337 |
780 my rev@62e7bf090eba+ other rev@f4db7e329e71 ancestor rev@924404dff337 |
781 launching merge tool: python ../merge $TESTTMP/t/t/rev * * (glob) |
781 launching merge tool: python ../merge *$TESTTMP/t/t/rev* * * (glob) |
782 merge tool returned: 0 |
782 merge tool returned: 0 |
783 0 files updated, 2 files merged, 0 files removed, 0 files unresolved |
783 0 files updated, 2 files merged, 0 files removed, 0 files unresolved |
784 (branch merge, don't forget to commit) |
784 (branch merge, don't forget to commit) |
785 -------------- |
785 -------------- |
786 M b |
786 M b |
820 rev: versions differ -> m |
820 rev: versions differ -> m |
821 updating: rev 3/3 files (100.00%) |
821 updating: rev 3/3 files (100.00%) |
822 picked tool 'python ../merge' for rev (binary False symlink False) |
822 picked tool 'python ../merge' for rev (binary False symlink False) |
823 merging rev |
823 merging rev |
824 my rev@02963e448370+ other rev@2b958612230f ancestor rev@924404dff337 |
824 my rev@02963e448370+ other rev@2b958612230f ancestor rev@924404dff337 |
825 launching merge tool: python ../merge $TESTTMP/t/t/rev * * (glob) |
825 launching merge tool: python ../merge *$TESTTMP/t/t/rev* * * (glob) |
826 merge tool returned: 0 |
826 merge tool returned: 0 |
827 1 files updated, 2 files merged, 0 files removed, 0 files unresolved |
827 1 files updated, 2 files merged, 0 files removed, 0 files unresolved |
828 (branch merge, don't forget to commit) |
828 (branch merge, don't forget to commit) |
829 -------------- |
829 -------------- |
830 M b |
830 M b |