382 b004912a8510032a0350a74daa2803dadfb00e12 644 d |
380 b004912a8510032a0350a74daa2803dadfb00e12 644 d |
383 |
381 |
384 $ hg manifest --debug --rev 'desc("d-2")' | grep '644 d' |
382 $ hg manifest --debug --rev 'desc("d-2")' | grep '644 d' |
385 b004912a8510032a0350a74daa2803dadfb00e12 644 d |
383 b004912a8510032a0350a74daa2803dadfb00e12 644 d |
386 $ hg manifest --debug --rev 'desc("b-1")' | grep '644 d' |
384 $ hg manifest --debug --rev 'desc("b-1")' | grep '644 d' |
387 169be882533bc917905d46c0c951aa9a1e288dcf 644 d |
385 01c2f5eabdc4ce2bdee42b5f86311955e6c8f573 644 d |
388 $ hg debugindex d |
386 $ hg debugindex d |
389 rev linkrev nodeid p1 p2 |
387 rev linkrev nodeid p1 p2 |
390 0 2 169be882533b 000000000000 000000000000 |
388 0 2 01c2f5eabdc4 000000000000 000000000000 |
391 1 8 b004912a8510 000000000000 000000000000 |
389 1 8 b004912a8510 000000000000 000000000000 |
392 |
390 |
393 Log output should not include a merge commit as it did not happen |
391 Log output should not include a merge commit as it did not happen |
394 |
392 |
395 $ hg log -Gfr 'desc("mBDm-0")' d |
393 $ hg log -Gfr 'desc("mBDm-0")' d |
418 - the "e-" branch renaming b to f (through 'g') |
416 - the "e-" branch renaming b to f (through 'g') |
419 - the "a-" branch renaming d to f (through e) |
417 - the "a-" branch renaming d to f (through e) |
420 |
418 |
421 $ hg up 'desc("a-2")' |
419 $ hg up 'desc("a-2")' |
422 2 files updated, 0 files merged, 1 files removed, 0 files unresolved |
420 2 files updated, 0 files merged, 1 files removed, 0 files unresolved |
423 $ hg merge 'desc("e-2")' --tool :union |
421 $ hg merge 'desc("e-2")' |
424 merging f |
|
425 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
422 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
426 (branch merge, don't forget to commit) |
423 (branch merge, don't forget to commit) |
427 $ hg ci -m 'mAEm-0 simple merge - one way' |
424 $ hg ci -m 'mAEm-0 simple merge - one way' |
428 $ hg up 'desc("e-2")' |
425 $ hg up 'desc("e-2")' |
429 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
426 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
430 $ hg merge 'desc("a-2")' --tool :union |
427 $ hg merge 'desc("a-2")' |
431 merging f |
|
432 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
428 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
433 (branch merge, don't forget to commit) |
429 (branch merge, don't forget to commit) |
434 $ hg ci -m 'mEAm-0 simple merge - the other way' |
430 $ hg ci -m 'mEAm-0 simple merge - the other way' |
435 created new head |
431 created new head |
436 $ hg log -G --rev '::(desc("mAEm")+desc("mEAm"))' |
432 $ hg log -G --rev '::(desc("mAEm")+desc("mEAm"))' |
451 o 1 i-1: a -move-> c |
447 o 1 i-1: a -move-> c |
452 | |
448 | |
453 o 0 i-0 initial commit: a b h |
449 o 0 i-0 initial commit: a b h |
454 |
450 |
455 $ hg manifest --debug --rev 'desc("mAEm-0")' | grep '644 f' |
451 $ hg manifest --debug --rev 'desc("mAEm-0")' | grep '644 f' |
456 c39c6083dad048d5138618a46f123e2f397f4f18 644 f |
452 eb806e34ef6be4c264effd5933d31004ad15a793 644 f |
457 $ hg manifest --debug --rev 'desc("mEAm-0")' | grep '644 f' |
453 $ hg manifest --debug --rev 'desc("mEAm-0")' | grep '644 f' |
458 a9a8bc3860c9d8fa5f2f7e6ea8d40498322737fd 644 f |
454 eb806e34ef6be4c264effd5933d31004ad15a793 644 f |
459 $ hg manifest --debug --rev 'desc("a-2")' | grep '644 f' |
455 $ hg manifest --debug --rev 'desc("a-2")' | grep '644 f' |
460 263ea25e220aaeb7b9bac551c702037849aa75e8 644 f |
456 0dd616bc7ab1a111921d95d76f69cda5c2ac539c 644 f |
461 $ hg manifest --debug --rev 'desc("e-2")' | grep '644 f' |
457 $ hg manifest --debug --rev 'desc("e-2")' | grep '644 f' |
462 71b9b7e73d973572ade6dd765477fcee6890e8b1 644 f |
458 6da5a2eecb9c833f830b67a4972366d49a9a142c 644 f |
463 $ hg debugindex f |
459 $ hg debugindex f |
464 rev linkrev nodeid p1 p2 |
460 rev linkrev nodeid p1 p2 |
465 0 4 263ea25e220a 000000000000 000000000000 |
461 0 4 0dd616bc7ab1 000000000000 000000000000 |
466 1 10 71b9b7e73d97 000000000000 000000000000 |
462 1 10 6da5a2eecb9c 000000000000 000000000000 |
467 2 19 c39c6083dad0 263ea25e220a 71b9b7e73d97 |
463 2 19 eb806e34ef6b 0dd616bc7ab1 6da5a2eecb9c |
468 3 20 a9a8bc3860c9 71b9b7e73d97 263ea25e220a |
|
469 |
464 |
470 # Here the filelog based implementation is not looking at the rename |
465 # Here the filelog based implementation is not looking at the rename |
471 # information (because the file exist on both side). However the changelog |
466 # information (because the file exist on both side). However the changelog |
472 # based on works fine. We have different output. |
467 # based on works fine. We have different output. |
473 |
468 |
547 created new head |
542 created new head |
548 $ hg mv --force i d |
543 $ hg mv --force i d |
549 $ hg commit -m "f-2: rename i -> d" |
544 $ hg commit -m "f-2: rename i -> d" |
550 $ hg debugindex d |
545 $ hg debugindex d |
551 rev linkrev nodeid p1 p2 |
546 rev linkrev nodeid p1 p2 |
552 0 2 169be882533b 000000000000 000000000000 |
547 0 2 01c2f5eabdc4 000000000000 000000000000 |
553 1 8 b004912a8510 000000000000 000000000000 |
548 1 8 b004912a8510 000000000000 000000000000 |
554 2 22 4a067cf8965d 000000000000 000000000000 |
549 2 22 c72365ee036f 000000000000 000000000000 |
555 $ hg up 'desc("b-1")' |
550 $ hg up 'desc("b-1")' |
556 3 files updated, 0 files merged, 0 files removed, 0 files unresolved |
551 3 files updated, 0 files merged, 0 files removed, 0 files unresolved |
557 $ hg merge 'desc("f-2")' |
552 $ hg merge 'desc("f-2")' |
558 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
553 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
559 (branch merge, don't forget to commit) |
554 (branch merge, don't forget to commit) |
746 |
741 |
747 $ hg up 'desc("f-2")' |
742 $ hg up 'desc("f-2")' |
748 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
743 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
749 $ hg merge 'desc("g-1")' --tool :union |
744 $ hg merge 'desc("g-1")' --tool :union |
750 merging d |
745 merging d |
751 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
746 0 files updated, 1 files merged, 0 files removed, 0 files unresolved |
752 (branch merge, don't forget to commit) |
747 (branch merge, don't forget to commit) |
753 $ hg ci -m 'mFGm-0 simple merge - one way' |
748 $ hg ci -m 'mFGm-0 simple merge - one way' |
754 created new head |
749 created new head |
755 $ hg up 'desc("g-1")' |
750 $ hg up 'desc("g-1")' |
756 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
751 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
757 $ hg merge 'desc("f-2")' --tool :union |
752 $ hg merge 'desc("f-2")' --tool :union |
758 merging d |
753 merging d |
759 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
754 0 files updated, 1 files merged, 1 files removed, 0 files unresolved |
760 (branch merge, don't forget to commit) |
755 (branch merge, don't forget to commit) |
761 $ hg ci -m 'mGFm-0 simple merge - the other way' |
756 $ hg ci -m 'mGFm-0 simple merge - the other way' |
762 created new head |
757 created new head |
763 $ hg log -G --rev '::(desc("mGFm")+desc("mFGm"))' |
758 $ hg log -G --rev '::(desc("mGFm")+desc("mFGm"))' |
764 @ 29 mGFm-0 simple merge - the other way |
759 @ 29 mGFm-0 simple merge - the other way |
777 | |
772 | |
778 o 0 i-0 initial commit: a b h |
773 o 0 i-0 initial commit: a b h |
779 |
774 |
780 $ hg status --copies --rev 'desc("i-0")' --rev 'desc("mFGm-0")' |
775 $ hg status --copies --rev 'desc("i-0")' --rev 'desc("mFGm-0")' |
781 A d |
776 A d |
782 h |
777 h (no-filelog !) |
|
778 a (filelog !) |
783 R a |
779 R a |
784 R h |
780 R h |
785 $ hg status --copies --rev 'desc("i-0")' --rev 'desc("mGFm-0")' |
781 $ hg status --copies --rev 'desc("i-0")' --rev 'desc("mGFm-0")' |
786 A d |
782 A d |
787 a (no-filelog !) |
783 a |
788 h (filelog !) |
|
789 R a |
784 R a |
790 R h |
785 R h |
791 $ hg status --copies --rev 'desc("f-2")' --rev 'desc("mFGm-0")' |
786 $ hg status --copies --rev 'desc("f-2")' --rev 'desc("mFGm-0")' |
792 M d |
787 M d |
793 $ hg status --copies --rev 'desc("f-2")' --rev 'desc("mGFm-0")' |
788 $ hg status --copies --rev 'desc("f-2")' --rev 'desc("mGFm-0")' |