equal
deleted
inserted
replaced
920 $ hg ci -Aqm "m2" |
920 $ hg ci -Aqm "m2" |
921 $ hg up -qr1 |
921 $ hg up -qr1 |
922 $ mkdir 7 8 |
922 $ mkdir 7 8 |
923 $ echo m > 7/f |
923 $ echo m > 7/f |
924 $ echo m > 8/f |
924 $ echo m > 8/f |
925 $ hg merge -f --tool internal:dump -v --debug -r2 | sed '/^ 0\/f: both created -> m/,$d' 2> /dev/null |
925 $ hg merge -f --tool internal:dump -v --debug -r2 | sed '/^resolving manifests/,$d' 2> /dev/null |
926 searching for copies back to rev 1 |
926 searching for copies back to rev 1 |
927 unmatched files in local: |
927 unmatched files in local: |
928 5/g |
928 5/g |
929 6/g |
929 6/g |
930 unmatched files in other: |
930 unmatched files in other: |
938 src: '3/f' -> dst: '3/g' * |
938 src: '3/f' -> dst: '3/g' * |
939 src: '4/f' -> dst: '4/g' * |
939 src: '4/f' -> dst: '4/g' * |
940 src: '5/f' -> dst: '5/g' * |
940 src: '5/f' -> dst: '5/g' * |
941 src: '6/f' -> dst: '6/g' * |
941 src: '6/f' -> dst: '6/g' * |
942 checking for directory renames |
942 checking for directory renames |
943 resolving manifests |
|
944 branchmerge: True, force: True, partial: False |
|
945 ancestor: e6cb3cf11019, local: ec44bf929ab5+, remote: c62e34d0b898 |
|
946 remote changed 8/f which local deleted |
|
947 use (c)hanged version or leave (d)eleted? c |
|
948 preserving 0/f for resolve of 0/f |
|
949 preserving 1/g for resolve of 1/g |
|
950 preserving 2/f for resolve of 2/f |
|
951 preserving 3/f for resolve of 3/f |
|
952 preserving 3/f for resolve of 3/g |
|
953 preserving 4/f for resolve of 4/g |
|
954 preserving 5/f for resolve of 5/f |
|
955 preserving 5/g for resolve of 5/g |
|
956 preserving 6/g for resolve of 6/g |
|
957 preserving 7/f for resolve of 7/f |
|
958 removing 4/f |
|
959 8/f: prompt recreating -> g |
|
960 getting 8/f |
|
961 $ hg mani |
943 $ hg mani |
962 0/f |
944 0/f |
963 1/g |
945 1/g |
964 2/f |
946 2/f |
965 3/f |
947 3/f |