equal
deleted
inserted
replaced
74 $ tm "up a " "nc a b" " " "1 get local a to b" |
74 $ tm "up a " "nc a b" " " "1 get local a to b" |
75 created new head |
75 created new head |
76 -------------- |
76 -------------- |
77 test L:up a R:nc a b W: - 1 get local a to b |
77 test L:up a R:nc a b W: - 1 get local a to b |
78 -------------- |
78 -------------- |
79 searching for copies back to rev 1 |
|
80 unmatched files in other: |
79 unmatched files in other: |
81 b |
80 b |
82 all copies found (* = to merge, ! = divergent, % = renamed and deleted): |
81 all copies found (* = to merge, ! = divergent, % = renamed and deleted): |
83 src: 'a' -> dst: 'b' * |
82 src: 'a' -> dst: 'b' * |
84 checking for directory renames |
83 checking for directory renames |
113 $ tm "nc a b" "up a " " " "2 get rem change to a and b" |
112 $ tm "nc a b" "up a " " " "2 get rem change to a and b" |
114 created new head |
113 created new head |
115 -------------- |
114 -------------- |
116 test L:nc a b R:up a W: - 2 get rem change to a and b |
115 test L:nc a b R:up a W: - 2 get rem change to a and b |
117 -------------- |
116 -------------- |
118 searching for copies back to rev 1 |
|
119 unmatched files in local: |
117 unmatched files in local: |
120 b |
118 b |
121 all copies found (* = to merge, ! = divergent, % = renamed and deleted): |
119 all copies found (* = to merge, ! = divergent, % = renamed and deleted): |
122 src: 'a' -> dst: 'b' * |
120 src: 'a' -> dst: 'b' * |
123 checking for directory renames |
121 checking for directory renames |
153 $ tm "up a " "nm a b" " " "3 get local a change to b, remove a" |
151 $ tm "up a " "nm a b" " " "3 get local a change to b, remove a" |
154 created new head |
152 created new head |
155 -------------- |
153 -------------- |
156 test L:up a R:nm a b W: - 3 get local a change to b, remove a |
154 test L:up a R:nm a b W: - 3 get local a change to b, remove a |
157 -------------- |
155 -------------- |
158 searching for copies back to rev 1 |
|
159 unmatched files in other: |
156 unmatched files in other: |
160 b |
157 b |
161 all copies found (* = to merge, ! = divergent, % = renamed and deleted): |
158 all copies found (* = to merge, ! = divergent, % = renamed and deleted): |
162 src: 'a' -> dst: 'b' * |
159 src: 'a' -> dst: 'b' * |
163 checking for directory renames |
160 checking for directory renames |
192 $ tm "nm a b" "up a " " " "4 get remote change to b" |
189 $ tm "nm a b" "up a " " " "4 get remote change to b" |
193 created new head |
190 created new head |
194 -------------- |
191 -------------- |
195 test L:nm a b R:up a W: - 4 get remote change to b |
192 test L:nm a b R:up a W: - 4 get remote change to b |
196 -------------- |
193 -------------- |
197 searching for copies back to rev 1 |
|
198 unmatched files in local: |
194 unmatched files in local: |
199 b |
195 b |
200 all copies found (* = to merge, ! = divergent, % = renamed and deleted): |
196 all copies found (* = to merge, ! = divergent, % = renamed and deleted): |
201 src: 'a' -> dst: 'b' * |
197 src: 'a' -> dst: 'b' * |
202 checking for directory renames |
198 checking for directory renames |
230 $ tm " " "nc a b" " " "5 get b" |
226 $ tm " " "nc a b" " " "5 get b" |
231 created new head |
227 created new head |
232 -------------- |
228 -------------- |
233 test L: R:nc a b W: - 5 get b |
229 test L: R:nc a b W: - 5 get b |
234 -------------- |
230 -------------- |
235 searching for copies back to rev 1 |
|
236 unmatched files in other: |
231 unmatched files in other: |
237 b |
232 b |
238 all copies found (* = to merge, ! = divergent, % = renamed and deleted): |
233 all copies found (* = to merge, ! = divergent, % = renamed and deleted): |
239 src: 'a' -> dst: 'b' |
234 src: 'a' -> dst: 'b' |
240 checking for directory renames |
235 checking for directory renames |
263 $ tm "nc a b" " " " " "6 nothing" |
258 $ tm "nc a b" " " " " "6 nothing" |
264 created new head |
259 created new head |
265 -------------- |
260 -------------- |
266 test L:nc a b R: W: - 6 nothing |
261 test L:nc a b R: W: - 6 nothing |
267 -------------- |
262 -------------- |
268 searching for copies back to rev 1 |
|
269 unmatched files in local: |
263 unmatched files in local: |
270 b |
264 b |
271 all copies found (* = to merge, ! = divergent, % = renamed and deleted): |
265 all copies found (* = to merge, ! = divergent, % = renamed and deleted): |
272 src: 'a' -> dst: 'b' |
266 src: 'a' -> dst: 'b' |
273 checking for directory renames |
267 checking for directory renames |
295 $ tm " " "nm a b" " " "7 get b" |
289 $ tm " " "nm a b" " " "7 get b" |
296 created new head |
290 created new head |
297 -------------- |
291 -------------- |
298 test L: R:nm a b W: - 7 get b |
292 test L: R:nm a b W: - 7 get b |
299 -------------- |
293 -------------- |
300 searching for copies back to rev 1 |
|
301 unmatched files in other: |
294 unmatched files in other: |
302 b |
295 b |
303 all copies found (* = to merge, ! = divergent, % = renamed and deleted): |
296 all copies found (* = to merge, ! = divergent, % = renamed and deleted): |
304 src: 'a' -> dst: 'b' |
297 src: 'a' -> dst: 'b' |
305 checking for directory renames |
298 checking for directory renames |
329 $ tm "nm a b" " " " " "8 nothing" |
322 $ tm "nm a b" " " " " "8 nothing" |
330 created new head |
323 created new head |
331 -------------- |
324 -------------- |
332 test L:nm a b R: W: - 8 nothing |
325 test L:nm a b R: W: - 8 nothing |
333 -------------- |
326 -------------- |
334 searching for copies back to rev 1 |
|
335 unmatched files in local: |
327 unmatched files in local: |
336 b |
328 b |
337 all copies found (* = to merge, ! = divergent, % = renamed and deleted): |
329 all copies found (* = to merge, ! = divergent, % = renamed and deleted): |
338 src: 'a' -> dst: 'b' |
330 src: 'a' -> dst: 'b' |
339 checking for directory renames |
331 checking for directory renames |
360 $ tm "um a b" "um a b" " " "9 do merge with ancestor in a" |
352 $ tm "um a b" "um a b" " " "9 do merge with ancestor in a" |
361 created new head |
353 created new head |
362 -------------- |
354 -------------- |
363 test L:um a b R:um a b W: - 9 do merge with ancestor in a |
355 test L:um a b R:um a b W: - 9 do merge with ancestor in a |
364 -------------- |
356 -------------- |
365 searching for copies back to rev 1 |
|
366 unmatched files new in both: |
357 unmatched files new in both: |
367 b |
358 b |
368 all copies found (* = to merge, ! = divergent, % = renamed and deleted): |
359 all copies found (* = to merge, ! = divergent, % = renamed and deleted): |
369 src: 'a' -> dst: 'b' * |
360 src: 'a' -> dst: 'b' * |
370 checking for directory renames |
361 checking for directory renames |
404 $ tm "nm a b" "nm a c" " " "11 get c, keep b" |
395 $ tm "nm a b" "nm a c" " " "11 get c, keep b" |
405 created new head |
396 created new head |
406 -------------- |
397 -------------- |
407 test L:nm a b R:nm a c W: - 11 get c, keep b |
398 test L:nm a b R:nm a c W: - 11 get c, keep b |
408 -------------- |
399 -------------- |
409 searching for copies back to rev 1 |
|
410 unmatched files in local: |
400 unmatched files in local: |
411 b |
401 b |
412 unmatched files in other: |
402 unmatched files in other: |
413 c |
403 c |
414 all copies found (* = to merge, ! = divergent, % = renamed and deleted): |
404 all copies found (* = to merge, ! = divergent, % = renamed and deleted): |
443 $ tm "nc a b" "up b " " " "12 merge b no ancestor" |
433 $ tm "nc a b" "up b " " " "12 merge b no ancestor" |
444 created new head |
434 created new head |
445 -------------- |
435 -------------- |
446 test L:nc a b R:up b W: - 12 merge b no ancestor |
436 test L:nc a b R:up b W: - 12 merge b no ancestor |
447 -------------- |
437 -------------- |
448 searching for copies back to rev 1 |
|
449 unmatched files new in both: |
438 unmatched files new in both: |
450 b |
439 b |
451 resolving manifests |
440 resolving manifests |
452 branchmerge: True, force: False, partial: False |
441 branchmerge: True, force: False, partial: False |
453 ancestor: 924404dff337, local: 86a2aa42fc76+, remote: af30c7647fc7 |
442 ancestor: 924404dff337, local: 86a2aa42fc76+, remote: af30c7647fc7 |
482 $ tm "up b " "nm a b" " " "13 merge b no ancestor" |
471 $ tm "up b " "nm a b" " " "13 merge b no ancestor" |
483 created new head |
472 created new head |
484 -------------- |
473 -------------- |
485 test L:up b R:nm a b W: - 13 merge b no ancestor |
474 test L:up b R:nm a b W: - 13 merge b no ancestor |
486 -------------- |
475 -------------- |
487 searching for copies back to rev 1 |
|
488 unmatched files new in both: |
476 unmatched files new in both: |
489 b |
477 b |
490 resolving manifests |
478 resolving manifests |
491 branchmerge: True, force: False, partial: False |
479 branchmerge: True, force: False, partial: False |
492 ancestor: 924404dff337, local: 59318016310c+, remote: bdb19105162a |
480 ancestor: 924404dff337, local: 59318016310c+, remote: bdb19105162a |
522 $ tm "nc a b" "up a b" " " "14 merge b no ancestor" |
510 $ tm "nc a b" "up a b" " " "14 merge b no ancestor" |
523 created new head |
511 created new head |
524 -------------- |
512 -------------- |
525 test L:nc a b R:up a b W: - 14 merge b no ancestor |
513 test L:nc a b R:up a b W: - 14 merge b no ancestor |
526 -------------- |
514 -------------- |
527 searching for copies back to rev 1 |
|
528 unmatched files new in both: |
515 unmatched files new in both: |
529 b |
516 b |
530 resolving manifests |
517 resolving manifests |
531 branchmerge: True, force: False, partial: False |
518 branchmerge: True, force: False, partial: False |
532 ancestor: 924404dff337, local: 86a2aa42fc76+, remote: 8dbce441892a |
519 ancestor: 924404dff337, local: 86a2aa42fc76+, remote: 8dbce441892a |
562 $ tm "up b " "nm a b" " " "15 merge b no ancestor, remove a" |
549 $ tm "up b " "nm a b" " " "15 merge b no ancestor, remove a" |
563 created new head |
550 created new head |
564 -------------- |
551 -------------- |
565 test L:up b R:nm a b W: - 15 merge b no ancestor, remove a |
552 test L:up b R:nm a b W: - 15 merge b no ancestor, remove a |
566 -------------- |
553 -------------- |
567 searching for copies back to rev 1 |
|
568 unmatched files new in both: |
554 unmatched files new in both: |
569 b |
555 b |
570 resolving manifests |
556 resolving manifests |
571 branchmerge: True, force: False, partial: False |
557 branchmerge: True, force: False, partial: False |
572 ancestor: 924404dff337, local: 59318016310c+, remote: bdb19105162a |
558 ancestor: 924404dff337, local: 59318016310c+, remote: bdb19105162a |
602 $ tm "nc a b" "up a b" " " "16 get a, merge b no ancestor" |
588 $ tm "nc a b" "up a b" " " "16 get a, merge b no ancestor" |
603 created new head |
589 created new head |
604 -------------- |
590 -------------- |
605 test L:nc a b R:up a b W: - 16 get a, merge b no ancestor |
591 test L:nc a b R:up a b W: - 16 get a, merge b no ancestor |
606 -------------- |
592 -------------- |
607 searching for copies back to rev 1 |
|
608 unmatched files new in both: |
593 unmatched files new in both: |
609 b |
594 b |
610 resolving manifests |
595 resolving manifests |
611 branchmerge: True, force: False, partial: False |
596 branchmerge: True, force: False, partial: False |
612 ancestor: 924404dff337, local: 86a2aa42fc76+, remote: 8dbce441892a |
597 ancestor: 924404dff337, local: 86a2aa42fc76+, remote: 8dbce441892a |
642 $ tm "up a b" "nc a b" " " "17 keep a, merge b no ancestor" |
627 $ tm "up a b" "nc a b" " " "17 keep a, merge b no ancestor" |
643 created new head |
628 created new head |
644 -------------- |
629 -------------- |
645 test L:up a b R:nc a b W: - 17 keep a, merge b no ancestor |
630 test L:up a b R:nc a b W: - 17 keep a, merge b no ancestor |
646 -------------- |
631 -------------- |
647 searching for copies back to rev 1 |
|
648 unmatched files new in both: |
632 unmatched files new in both: |
649 b |
633 b |
650 resolving manifests |
634 resolving manifests |
651 branchmerge: True, force: False, partial: False |
635 branchmerge: True, force: False, partial: False |
652 ancestor: 924404dff337, local: 0b76e65c8289+, remote: 4ce40f5aca24 |
636 ancestor: 924404dff337, local: 0b76e65c8289+, remote: 4ce40f5aca24 |
681 $ tm "nm a b" "up a b" " " "18 merge b no ancestor" |
665 $ tm "nm a b" "up a b" " " "18 merge b no ancestor" |
682 created new head |
666 created new head |
683 -------------- |
667 -------------- |
684 test L:nm a b R:up a b W: - 18 merge b no ancestor |
668 test L:nm a b R:up a b W: - 18 merge b no ancestor |
685 -------------- |
669 -------------- |
686 searching for copies back to rev 1 |
|
687 unmatched files new in both: |
670 unmatched files new in both: |
688 b |
671 b |
689 resolving manifests |
672 resolving manifests |
690 branchmerge: True, force: False, partial: False |
673 branchmerge: True, force: False, partial: False |
691 ancestor: 924404dff337, local: 02963e448370+, remote: 8dbce441892a |
674 ancestor: 924404dff337, local: 02963e448370+, remote: 8dbce441892a |
726 $ tm "up a b" "nm a b" " " "19 merge b no ancestor, prompt remove a" |
709 $ tm "up a b" "nm a b" " " "19 merge b no ancestor, prompt remove a" |
727 created new head |
710 created new head |
728 -------------- |
711 -------------- |
729 test L:up a b R:nm a b W: - 19 merge b no ancestor, prompt remove a |
712 test L:up a b R:nm a b W: - 19 merge b no ancestor, prompt remove a |
730 -------------- |
713 -------------- |
731 searching for copies back to rev 1 |
|
732 unmatched files new in both: |
714 unmatched files new in both: |
733 b |
715 b |
734 resolving manifests |
716 resolving manifests |
735 branchmerge: True, force: False, partial: False |
717 branchmerge: True, force: False, partial: False |
736 ancestor: 924404dff337, local: 0b76e65c8289+, remote: bdb19105162a |
718 ancestor: 924404dff337, local: 0b76e65c8289+, remote: bdb19105162a |
772 $ tm "up a " "um a b" " " "20 merge a and b to b, remove a" |
754 $ tm "up a " "um a b" " " "20 merge a and b to b, remove a" |
773 created new head |
755 created new head |
774 -------------- |
756 -------------- |
775 test L:up a R:um a b W: - 20 merge a and b to b, remove a |
757 test L:up a R:um a b W: - 20 merge a and b to b, remove a |
776 -------------- |
758 -------------- |
777 searching for copies back to rev 1 |
|
778 unmatched files in other: |
759 unmatched files in other: |
779 b |
760 b |
780 all copies found (* = to merge, ! = divergent, % = renamed and deleted): |
761 all copies found (* = to merge, ! = divergent, % = renamed and deleted): |
781 src: 'a' -> dst: 'b' * |
762 src: 'a' -> dst: 'b' * |
782 checking for directory renames |
763 checking for directory renames |
815 $ tm "um a b" "up a " " " "21 merge a and b to b" |
796 $ tm "um a b" "up a " " " "21 merge a and b to b" |
816 created new head |
797 created new head |
817 -------------- |
798 -------------- |
818 test L:um a b R:up a W: - 21 merge a and b to b |
799 test L:um a b R:up a W: - 21 merge a and b to b |
819 -------------- |
800 -------------- |
820 searching for copies back to rev 1 |
|
821 unmatched files in local: |
801 unmatched files in local: |
822 b |
802 b |
823 all copies found (* = to merge, ! = divergent, % = renamed and deleted): |
803 all copies found (* = to merge, ! = divergent, % = renamed and deleted): |
824 src: 'a' -> dst: 'b' * |
804 src: 'a' -> dst: 'b' * |
825 checking for directory renames |
805 checking for directory renames |
860 $ tm "nm a b" "up a c" " " "23 get c, keep b" |
840 $ tm "nm a b" "up a c" " " "23 get c, keep b" |
861 created new head |
841 created new head |
862 -------------- |
842 -------------- |
863 test L:nm a b R:up a c W: - 23 get c, keep b |
843 test L:nm a b R:up a c W: - 23 get c, keep b |
864 -------------- |
844 -------------- |
865 searching for copies back to rev 1 |
|
866 unmatched files in local: |
845 unmatched files in local: |
867 b |
846 b |
868 unmatched files in other: |
847 unmatched files in other: |
869 c |
848 c |
870 all copies found (* = to merge, ! = divergent, % = renamed and deleted): |
849 all copies found (* = to merge, ! = divergent, % = renamed and deleted): |
941 $ hg up -qr1 |
920 $ hg up -qr1 |
942 $ mkdir 7 8 |
921 $ mkdir 7 8 |
943 $ echo m > 7/f |
922 $ echo m > 7/f |
944 $ echo m > 8/f |
923 $ echo m > 8/f |
945 $ hg merge -f --tool internal:dump -v --debug -r2 | sed '/^resolving manifests/,$d' 2> /dev/null |
924 $ hg merge -f --tool internal:dump -v --debug -r2 | sed '/^resolving manifests/,$d' 2> /dev/null |
946 searching for copies back to rev 1 |
|
947 unmatched files in local: |
925 unmatched files in local: |
948 5/g |
926 5/g |
949 6/g |
927 6/g |
950 unmatched files in other: |
928 unmatched files in other: |
951 3/g |
929 3/g |