53 |
53 |
54 Non-interactive merge: |
54 Non-interactive merge: |
55 |
55 |
56 $ hg merge -y |
56 $ hg merge -y |
57 local changed file1 which remote deleted |
57 local changed file1 which remote deleted |
58 use (c)hanged version, (d)elete, or leave (u)nresolved? c |
58 use (c)hanged version, (d)elete, or leave (u)nresolved? u |
59 remote changed file2 which local deleted |
59 remote changed file2 which local deleted |
60 use (c)hanged version, leave (d)eleted, or leave (u)nresolved? c |
60 use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u |
61 merging file3 |
61 merging file3 |
62 warning: conflicts while merging file3! (edit, then use 'hg resolve --mark') |
62 warning: conflicts while merging file3! (edit, then use 'hg resolve --mark') |
63 0 files updated, 2 files merged, 0 files removed, 1 files unresolved |
63 0 files updated, 0 files merged, 0 files removed, 3 files unresolved |
64 use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon |
64 use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon |
65 [1] |
65 [1] |
66 |
66 |
67 $ status |
67 $ status |
68 --- status --- |
68 --- status --- |
69 M file2 |
69 M file2 |
70 M file3 |
70 M file3 |
71 C file1 |
71 C file1 |
72 --- resolve --list --- |
72 --- resolve --list --- |
73 R file1 |
73 U file1 |
74 R file2 |
74 U file2 |
75 U file3 |
75 U file3 |
76 --- debugmergestate --- |
76 --- debugmergestate --- |
77 * version 2 records |
77 * version 2 records |
78 local: 13910f48cf7bdb2a0ba6e24b4900e4fdd5739dd4 |
78 local: 13910f48cf7bdb2a0ba6e24b4900e4fdd5739dd4 |
79 other: 10f9a0a634e82080907e62f075ab119cbc565ea6 |
79 other: 10f9a0a634e82080907e62f075ab119cbc565ea6 |
80 file: file1 (record type "C", state "r", hash 60b27f004e454aca81b0480209cce5081ec52390) |
80 file: file1 (record type "C", state "u", hash 60b27f004e454aca81b0480209cce5081ec52390) |
81 local path: file1 (flags "") |
81 local path: file1 (flags "") |
82 ancestor path: file1 (node b8e02f6433738021a065f94175c7cd23db5f05be) |
82 ancestor path: file1 (node b8e02f6433738021a065f94175c7cd23db5f05be) |
83 other path: file1 (node null) |
83 other path: file1 (node null) |
84 file: file2 (record type "C", state "r", hash null) |
84 file: file2 (record type "C", state "u", hash null) |
85 local path: file2 (flags "") |
85 local path: file2 (flags "") |
86 ancestor path: file2 (node 5d9299349fc01ddd25d0070d149b124d8f10411e) |
86 ancestor path: file2 (node 5d9299349fc01ddd25d0070d149b124d8f10411e) |
87 other path: file2 (node e7c1328648519852e723de86c0c0525acd779257) |
87 other path: file2 (node e7c1328648519852e723de86c0c0525acd779257) |
88 file: file3 (record type "F", state "u", hash d5b0a58bc47161b1b8a831084b366f757c4f0b11) |
88 file: file3 (record type "F", state "u", hash d5b0a58bc47161b1b8a831084b366f757c4f0b11) |
89 local path: file3 (flags "") |
89 local path: file3 (flags "") |
468 $ hg co -C |
468 $ hg co -C |
469 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
469 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
470 |
470 |
471 $ hg merge --tool :prompt |
471 $ hg merge --tool :prompt |
472 local changed file1 which remote deleted |
472 local changed file1 which remote deleted |
473 use (c)hanged version, (d)elete, or leave (u)nresolved? c |
473 use (c)hanged version, (d)elete, or leave (u)nresolved? u |
474 remote changed file2 which local deleted |
474 remote changed file2 which local deleted |
475 use (c)hanged version, leave (d)eleted, or leave (u)nresolved? c |
475 use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u |
476 no tool found to merge file3 |
476 no tool found to merge file3 |
477 keep (l)ocal, take (o)ther, or leave (u)nresolved? u |
477 keep (l)ocal, take (o)ther, or leave (u)nresolved? u |
478 0 files updated, 2 files merged, 0 files removed, 1 files unresolved |
478 0 files updated, 0 files merged, 0 files removed, 3 files unresolved |
479 use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon |
479 use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon |
480 [1] |
480 [1] |
481 $ status |
481 $ status |
482 --- status --- |
482 --- status --- |
483 M file2 |
483 M file2 |
484 M file3 |
484 M file3 |
485 C file1 |
485 C file1 |
486 --- resolve --list --- |
486 --- resolve --list --- |
487 R file1 |
487 U file1 |
488 R file2 |
488 U file2 |
489 U file3 |
489 U file3 |
490 --- debugmergestate --- |
490 --- debugmergestate --- |
491 * version 2 records |
491 * version 2 records |
492 local: 13910f48cf7bdb2a0ba6e24b4900e4fdd5739dd4 |
492 local: 13910f48cf7bdb2a0ba6e24b4900e4fdd5739dd4 |
493 other: 10f9a0a634e82080907e62f075ab119cbc565ea6 |
493 other: 10f9a0a634e82080907e62f075ab119cbc565ea6 |
494 file: file1 (record type "C", state "r", hash 60b27f004e454aca81b0480209cce5081ec52390) |
494 file: file1 (record type "C", state "u", hash 60b27f004e454aca81b0480209cce5081ec52390) |
495 local path: file1 (flags "") |
495 local path: file1 (flags "") |
496 ancestor path: file1 (node b8e02f6433738021a065f94175c7cd23db5f05be) |
496 ancestor path: file1 (node b8e02f6433738021a065f94175c7cd23db5f05be) |
497 other path: file1 (node null) |
497 other path: file1 (node null) |
498 file: file2 (record type "C", state "r", hash null) |
498 file: file2 (record type "C", state "u", hash null) |
499 local path: file2 (flags "") |
499 local path: file2 (flags "") |
500 ancestor path: file2 (node 5d9299349fc01ddd25d0070d149b124d8f10411e) |
500 ancestor path: file2 (node 5d9299349fc01ddd25d0070d149b124d8f10411e) |
501 other path: file2 (node e7c1328648519852e723de86c0c0525acd779257) |
501 other path: file2 (node e7c1328648519852e723de86c0c0525acd779257) |
502 file: file3 (record type "F", state "u", hash d5b0a58bc47161b1b8a831084b366f757c4f0b11) |
502 file: file3 (record type "F", state "u", hash d5b0a58bc47161b1b8a831084b366f757c4f0b11) |
503 local path: file3 (flags "") |
503 local path: file3 (flags "") |
518 $ hg co -C |
518 $ hg co -C |
519 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
519 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
520 |
520 |
521 $ hg merge --tool :merge3 |
521 $ hg merge --tool :merge3 |
522 local changed file1 which remote deleted |
522 local changed file1 which remote deleted |
523 use (c)hanged version, (d)elete, or leave (u)nresolved? c |
523 use (c)hanged version, (d)elete, or leave (u)nresolved? u |
524 remote changed file2 which local deleted |
524 remote changed file2 which local deleted |
525 use (c)hanged version, leave (d)eleted, or leave (u)nresolved? c |
525 use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u |
526 merging file3 |
526 merging file3 |
527 warning: conflicts while merging file3! (edit, then use 'hg resolve --mark') |
527 warning: conflicts while merging file3! (edit, then use 'hg resolve --mark') |
528 0 files updated, 2 files merged, 0 files removed, 1 files unresolved |
528 0 files updated, 0 files merged, 0 files removed, 3 files unresolved |
529 use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon |
529 use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon |
530 [1] |
530 [1] |
531 $ status |
531 $ status |
532 --- status --- |
532 --- status --- |
533 M file2 |
533 M file2 |
534 M file3 |
534 M file3 |
535 C file1 |
535 C file1 |
536 --- resolve --list --- |
536 --- resolve --list --- |
537 R file1 |
537 U file1 |
538 R file2 |
538 U file2 |
539 U file3 |
539 U file3 |
540 --- debugmergestate --- |
540 --- debugmergestate --- |
541 * version 2 records |
541 * version 2 records |
542 local: 13910f48cf7bdb2a0ba6e24b4900e4fdd5739dd4 |
542 local: 13910f48cf7bdb2a0ba6e24b4900e4fdd5739dd4 |
543 other: 10f9a0a634e82080907e62f075ab119cbc565ea6 |
543 other: 10f9a0a634e82080907e62f075ab119cbc565ea6 |
544 file: file1 (record type "C", state "r", hash 60b27f004e454aca81b0480209cce5081ec52390) |
544 file: file1 (record type "C", state "u", hash 60b27f004e454aca81b0480209cce5081ec52390) |
545 local path: file1 (flags "") |
545 local path: file1 (flags "") |
546 ancestor path: file1 (node b8e02f6433738021a065f94175c7cd23db5f05be) |
546 ancestor path: file1 (node b8e02f6433738021a065f94175c7cd23db5f05be) |
547 other path: file1 (node null) |
547 other path: file1 (node null) |
548 file: file2 (record type "C", state "r", hash null) |
548 file: file2 (record type "C", state "u", hash null) |
549 local path: file2 (flags "") |
549 local path: file2 (flags "") |
550 ancestor path: file2 (node 5d9299349fc01ddd25d0070d149b124d8f10411e) |
550 ancestor path: file2 (node 5d9299349fc01ddd25d0070d149b124d8f10411e) |
551 other path: file2 (node e7c1328648519852e723de86c0c0525acd779257) |
551 other path: file2 (node e7c1328648519852e723de86c0c0525acd779257) |
552 file: file3 (record type "F", state "u", hash d5b0a58bc47161b1b8a831084b366f757c4f0b11) |
552 file: file3 (record type "F", state "u", hash d5b0a58bc47161b1b8a831084b366f757c4f0b11) |
553 local path: file3 (flags "") |
553 local path: file3 (flags "") |
677 3 files updated, 0 files merged, 0 files removed, 0 files unresolved |
677 3 files updated, 0 files merged, 0 files removed, 0 files unresolved |
678 $ echo changed >> file1 |
678 $ echo changed >> file1 |
679 $ hg rm file2 |
679 $ hg rm file2 |
680 $ hg update 1 -y |
680 $ hg update 1 -y |
681 local changed file1 which remote deleted |
681 local changed file1 which remote deleted |
682 use (c)hanged version, (d)elete, or leave (u)nresolved? c |
682 use (c)hanged version, (d)elete, or leave (u)nresolved? u |
683 remote changed file2 which local deleted |
683 remote changed file2 which local deleted |
684 use (c)hanged version, leave (d)eleted, or leave (u)nresolved? c |
684 use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u |
685 1 files updated, 2 files merged, 0 files removed, 0 files unresolved |
685 1 files updated, 0 files merged, 0 files removed, 2 files unresolved |
|
686 use 'hg resolve' to retry unresolved file merges |
|
687 [1] |
686 $ status |
688 $ status |
687 --- status --- |
689 --- status --- |
688 A file1 |
690 A file1 |
689 C file2 |
691 C file2 |
690 C file3 |
692 C file3 |
691 --- resolve --list --- |
693 --- resolve --list --- |
692 R file1 |
694 U file1 |
693 R file2 |
695 U file2 |
694 --- debugmergestate --- |
696 --- debugmergestate --- |
695 * version 2 records |
697 * version 2 records |
696 local: ab57bf49aa276a22d35a473592d4c34b5abc3eff |
698 local: ab57bf49aa276a22d35a473592d4c34b5abc3eff |
697 other: 10f9a0a634e82080907e62f075ab119cbc565ea6 |
699 other: 10f9a0a634e82080907e62f075ab119cbc565ea6 |
698 file: file1 (record type "C", state "r", hash 60b27f004e454aca81b0480209cce5081ec52390) |
700 file: file1 (record type "C", state "u", hash 60b27f004e454aca81b0480209cce5081ec52390) |
699 local path: file1 (flags "") |
701 local path: file1 (flags "") |
700 ancestor path: file1 (node b8e02f6433738021a065f94175c7cd23db5f05be) |
702 ancestor path: file1 (node b8e02f6433738021a065f94175c7cd23db5f05be) |
701 other path: file1 (node null) |
703 other path: file1 (node null) |
702 file: file2 (record type "C", state "r", hash null) |
704 file: file2 (record type "C", state "u", hash null) |
703 local path: file2 (flags "") |
705 local path: file2 (flags "") |
704 ancestor path: file2 (node 5d9299349fc01ddd25d0070d149b124d8f10411e) |
706 ancestor path: file2 (node 5d9299349fc01ddd25d0070d149b124d8f10411e) |
705 other path: file2 (node e7c1328648519852e723de86c0c0525acd779257) |
707 other path: file2 (node e7c1328648519852e723de86c0c0525acd779257) |
706 --- file1 --- |
708 --- file1 --- |
707 1 |
709 1 |
876 3 files updated, 0 files merged, 0 files removed, 0 files unresolved |
878 3 files updated, 0 files merged, 0 files removed, 0 files unresolved |
877 $ echo changed >> file1 |
879 $ echo changed >> file1 |
878 $ hg rm file2 |
880 $ hg rm file2 |
879 $ hg update 1 --tool :merge3 |
881 $ hg update 1 --tool :merge3 |
880 local changed file1 which remote deleted |
882 local changed file1 which remote deleted |
881 use (c)hanged version, (d)elete, or leave (u)nresolved? c |
883 use (c)hanged version, (d)elete, or leave (u)nresolved? u |
882 remote changed file2 which local deleted |
884 remote changed file2 which local deleted |
883 use (c)hanged version, leave (d)eleted, or leave (u)nresolved? c |
885 use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u |
884 1 files updated, 2 files merged, 0 files removed, 0 files unresolved |
886 1 files updated, 0 files merged, 0 files removed, 2 files unresolved |
|
887 use 'hg resolve' to retry unresolved file merges |
|
888 [1] |
885 $ status |
889 $ status |
886 --- status --- |
890 --- status --- |
887 A file1 |
891 A file1 |
888 C file2 |
892 C file2 |
889 C file3 |
893 C file3 |
890 --- resolve --list --- |
894 --- resolve --list --- |
891 R file1 |
895 U file1 |
892 R file2 |
896 U file2 |
893 --- debugmergestate --- |
897 --- debugmergestate --- |
894 * version 2 records |
898 * version 2 records |
895 local: ab57bf49aa276a22d35a473592d4c34b5abc3eff |
899 local: ab57bf49aa276a22d35a473592d4c34b5abc3eff |
896 other: 10f9a0a634e82080907e62f075ab119cbc565ea6 |
900 other: 10f9a0a634e82080907e62f075ab119cbc565ea6 |
897 file: file1 (record type "C", state "r", hash 60b27f004e454aca81b0480209cce5081ec52390) |
901 file: file1 (record type "C", state "u", hash 60b27f004e454aca81b0480209cce5081ec52390) |
898 local path: file1 (flags "") |
902 local path: file1 (flags "") |
899 ancestor path: file1 (node b8e02f6433738021a065f94175c7cd23db5f05be) |
903 ancestor path: file1 (node b8e02f6433738021a065f94175c7cd23db5f05be) |
900 other path: file1 (node null) |
904 other path: file1 (node null) |
901 file: file2 (record type "C", state "r", hash null) |
905 file: file2 (record type "C", state "u", hash null) |
902 local path: file2 (flags "") |
906 local path: file2 (flags "") |
903 ancestor path: file2 (node 5d9299349fc01ddd25d0070d149b124d8f10411e) |
907 ancestor path: file2 (node 5d9299349fc01ddd25d0070d149b124d8f10411e) |
904 other path: file2 (node e7c1328648519852e723de86c0c0525acd779257) |
908 other path: file2 (node e7c1328648519852e723de86c0c0525acd779257) |
905 --- file1 --- |
909 --- file1 --- |
906 1 |
910 1 |