equal
deleted
inserted
replaced
341 resolving manifests |
341 resolving manifests |
342 branchmerge: True, force: False, partial: False |
342 branchmerge: True, force: False, partial: False |
343 ancestor: 924404dff337, local: 62e7bf090eba+, remote: 49b6d8032493 |
343 ancestor: 924404dff337, local: 62e7bf090eba+, remote: 49b6d8032493 |
344 preserving b for resolve of b |
344 preserving b for resolve of b |
345 preserving rev for resolve of rev |
345 preserving rev for resolve of rev |
346 b: versions differ -> m |
346 b: both created -> m |
347 updating: b 1/2 files (50.00%) |
347 updating: b 1/2 files (50.00%) |
348 picked tool 'python ../merge' for b (binary False symlink False) |
348 picked tool 'python ../merge' for b (binary False symlink False) |
349 merging b |
349 merging b |
350 my b@62e7bf090eba+ other b@49b6d8032493 ancestor a@924404dff337 |
350 my b@62e7bf090eba+ other b@49b6d8032493 ancestor a@924404dff337 |
351 rev: versions differ -> m |
351 rev: versions differ -> m |
411 resolving manifests |
411 resolving manifests |
412 branchmerge: True, force: False, partial: False |
412 branchmerge: True, force: False, partial: False |
413 ancestor: 924404dff337, local: 86a2aa42fc76+, remote: af30c7647fc7 |
413 ancestor: 924404dff337, local: 86a2aa42fc76+, remote: af30c7647fc7 |
414 preserving b for resolve of b |
414 preserving b for resolve of b |
415 preserving rev for resolve of rev |
415 preserving rev for resolve of rev |
416 b: versions differ -> m |
416 b: both created -> m |
417 updating: b 1/2 files (50.00%) |
417 updating: b 1/2 files (50.00%) |
418 picked tool 'python ../merge' for b (binary False symlink False) |
418 picked tool 'python ../merge' for b (binary False symlink False) |
419 merging b |
419 merging b |
420 my b@86a2aa42fc76+ other b@af30c7647fc7 ancestor b@000000000000 |
420 my b@86a2aa42fc76+ other b@af30c7647fc7 ancestor b@000000000000 |
421 rev: versions differ -> m |
421 rev: versions differ -> m |
444 preserving b for resolve of b |
444 preserving b for resolve of b |
445 preserving rev for resolve of rev |
445 preserving rev for resolve of rev |
446 a: other deleted -> r |
446 a: other deleted -> r |
447 removing a |
447 removing a |
448 updating: a 1/3 files (33.33%) |
448 updating: a 1/3 files (33.33%) |
449 b: versions differ -> m |
449 b: both created -> m |
450 updating: b 2/3 files (66.67%) |
450 updating: b 2/3 files (66.67%) |
451 picked tool 'python ../merge' for b (binary False symlink False) |
451 picked tool 'python ../merge' for b (binary False symlink False) |
452 merging b |
452 merging b |
453 my b@59318016310c+ other b@bdb19105162a ancestor b@000000000000 |
453 my b@59318016310c+ other b@bdb19105162a ancestor b@000000000000 |
454 rev: versions differ -> m |
454 rev: versions differ -> m |
476 preserving b for resolve of b |
476 preserving b for resolve of b |
477 preserving rev for resolve of rev |
477 preserving rev for resolve of rev |
478 a: remote is newer -> g |
478 a: remote is newer -> g |
479 getting a |
479 getting a |
480 updating: a 1/3 files (33.33%) |
480 updating: a 1/3 files (33.33%) |
481 b: versions differ -> m |
481 b: both created -> m |
482 updating: b 2/3 files (66.67%) |
482 updating: b 2/3 files (66.67%) |
483 picked tool 'python ../merge' for b (binary False symlink False) |
483 picked tool 'python ../merge' for b (binary False symlink False) |
484 merging b |
484 merging b |
485 my b@86a2aa42fc76+ other b@8dbce441892a ancestor b@000000000000 |
485 my b@86a2aa42fc76+ other b@8dbce441892a ancestor b@000000000000 |
486 rev: versions differ -> m |
486 rev: versions differ -> m |
509 preserving b for resolve of b |
509 preserving b for resolve of b |
510 preserving rev for resolve of rev |
510 preserving rev for resolve of rev |
511 a: other deleted -> r |
511 a: other deleted -> r |
512 removing a |
512 removing a |
513 updating: a 1/3 files (33.33%) |
513 updating: a 1/3 files (33.33%) |
514 b: versions differ -> m |
514 b: both created -> m |
515 updating: b 2/3 files (66.67%) |
515 updating: b 2/3 files (66.67%) |
516 picked tool 'python ../merge' for b (binary False symlink False) |
516 picked tool 'python ../merge' for b (binary False symlink False) |
517 merging b |
517 merging b |
518 my b@59318016310c+ other b@bdb19105162a ancestor b@000000000000 |
518 my b@59318016310c+ other b@bdb19105162a ancestor b@000000000000 |
519 rev: versions differ -> m |
519 rev: versions differ -> m |
541 preserving b for resolve of b |
541 preserving b for resolve of b |
542 preserving rev for resolve of rev |
542 preserving rev for resolve of rev |
543 a: remote is newer -> g |
543 a: remote is newer -> g |
544 getting a |
544 getting a |
545 updating: a 1/3 files (33.33%) |
545 updating: a 1/3 files (33.33%) |
546 b: versions differ -> 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@86a2aa42fc76+ other b@8dbce441892a ancestor b@000000000000 |
550 my b@86a2aa42fc76+ other b@8dbce441892a ancestor b@000000000000 |
551 rev: versions differ -> m |
551 rev: versions differ -> m |
572 branchmerge: True, force: False, partial: False |
572 branchmerge: True, force: False, partial: False |
573 ancestor: 924404dff337, local: 0b76e65c8289+, remote: 4ce40f5aca24 |
573 ancestor: 924404dff337, local: 0b76e65c8289+, remote: 4ce40f5aca24 |
574 preserving b for resolve of b |
574 preserving b for resolve of b |
575 preserving rev for resolve of rev |
575 preserving rev for resolve of rev |
576 a: keep -> k |
576 a: keep -> k |
577 b: versions differ -> m |
577 b: both created -> m |
578 updating: b 1/2 files (50.00%) |
578 updating: b 1/2 files (50.00%) |
579 picked tool 'python ../merge' for b (binary False symlink False) |
579 picked tool 'python ../merge' for b (binary False symlink False) |
580 merging b |
580 merging b |
581 my b@0b76e65c8289+ other b@4ce40f5aca24 ancestor b@000000000000 |
581 my b@0b76e65c8289+ other b@4ce40f5aca24 ancestor b@000000000000 |
582 rev: versions differ -> m |
582 rev: versions differ -> m |
607 preserving b for resolve of b |
607 preserving b for resolve of b |
608 preserving rev for resolve of rev |
608 preserving rev for resolve of rev |
609 a: prompt recreating -> g |
609 a: prompt recreating -> g |
610 getting a |
610 getting a |
611 updating: a 1/3 files (33.33%) |
611 updating: a 1/3 files (33.33%) |
612 b: versions differ -> m |
612 b: both created -> m |
613 updating: b 2/3 files (66.67%) |
613 updating: b 2/3 files (66.67%) |
614 picked tool 'python ../merge' for b (binary False symlink False) |
614 picked tool 'python ../merge' for b (binary False symlink False) |
615 merging b |
615 merging b |
616 my b@02963e448370+ other b@8dbce441892a ancestor b@000000000000 |
616 my b@02963e448370+ other b@8dbce441892a ancestor b@000000000000 |
617 rev: versions differ -> m |
617 rev: versions differ -> m |
641 use (c)hanged version or (d)elete? c |
641 use (c)hanged version or (d)elete? c |
642 preserving b for resolve of b |
642 preserving b for resolve of b |
643 preserving rev for resolve of rev |
643 preserving rev for resolve of rev |
644 a: prompt keep -> a |
644 a: prompt keep -> a |
645 updating: a 1/3 files (33.33%) |
645 updating: a 1/3 files (33.33%) |
646 b: versions differ -> m |
646 b: both created -> m |
647 updating: b 2/3 files (66.67%) |
647 updating: b 2/3 files (66.67%) |
648 picked tool 'python ../merge' for b (binary False symlink False) |
648 picked tool 'python ../merge' for b (binary False symlink False) |
649 merging b |
649 merging b |
650 my b@0b76e65c8289+ other b@bdb19105162a ancestor b@000000000000 |
650 my b@0b76e65c8289+ other b@bdb19105162a ancestor b@000000000000 |
651 rev: versions differ -> m |
651 rev: versions differ -> m |