equal
deleted
inserted
replaced
482 $ hg up null -q # to be not based on 9 anymore |
482 $ hg up null -q # to be not based on 9 anymore |
483 |
483 |
484 check rebase compat |
484 check rebase compat |
485 |
485 |
486 $ hg log -G --template='{rev} - {node|short} {desc}\n' |
486 $ hg log -G --template='{rev} - {node|short} {desc}\n' |
487 o 8 - 159dfc9fa5d3 add obsol_d'' |
487 * 8 - 159dfc9fa5d3 add obsol_d'' |
488 | |
488 | |
489 | o 4 - 725c380fe99b add obsol_c' |
489 | o 4 - 725c380fe99b add obsol_c' |
490 | | |
490 | | |
491 x | 3 - 0d3f46688ccc add obsol_c |
491 x | 3 - 0d3f46688ccc add obsol_c |
492 |/ |
492 |/ |
496 |
496 |
497 |
497 |
498 $ hg log -G --template='{rev} - {node|short} {desc}\n' --hidden |
498 $ hg log -G --template='{rev} - {node|short} {desc}\n' --hidden |
499 x 9 - 83b5778897ad add toto |
499 x 9 - 83b5778897ad add toto |
500 |
500 |
501 o 8 - 159dfc9fa5d3 add obsol_d'' |
501 * 8 - 159dfc9fa5d3 add obsol_d'' |
502 | |
502 | |
503 | x 7 - 909a0fb57e5d add obsol_d' |
503 | x 7 - 909a0fb57e5d add obsol_d' |
504 |/ |
504 |/ |
505 | x 6 - 95de7fc6918d add obsol_d |
505 | x 6 - 95de7fc6918d add obsol_d |
506 |/ |
506 |/ |
530 $ hg up tip |
530 $ hg up tip |
531 ? files updated, 0 files merged, 0 files removed, 0 files unresolved (glob) |
531 ? files updated, 0 files merged, 0 files removed, 0 files unresolved (glob) |
532 $ hg log -G --template='{rev} - {node|short} {desc}\n' |
532 $ hg log -G --template='{rev} - {node|short} {desc}\n' |
533 @ 11 - 9468a5f5d8b2 add obsol_d'' |
533 @ 11 - 9468a5f5d8b2 add obsol_d'' |
534 | |
534 | |
535 o 10 - 2033b4e49474 add obsol_c |
535 * 10 - 2033b4e49474 add obsol_c |
536 | |
536 | |
537 o 4 - 725c380fe99b add obsol_c' |
537 * 4 - 725c380fe99b add obsol_c' |
538 | |
538 | |
539 o 1 - 7c3bad9141dc add b |
539 o 1 - 7c3bad9141dc add b |
540 | |
540 | |
541 o 0 - 1f0dee641bb7 add a |
541 o 0 - 1f0dee641bb7 add a |
542 |
542 |
618 | parent: 10:2033b4e49474 |
618 | parent: 10:2033b4e49474 |
619 | user: test |
619 | user: test |
620 | date: Thu Jan 01 00:00:00 1970 +0000 |
620 | date: Thu Jan 01 00:00:00 1970 +0000 |
621 | summary: add f |
621 | summary: add f |
622 | |
622 | |
623 | o changeset: 12:6db5e282cb91 |
623 | * changeset: 12:6db5e282cb91 |
624 |/ parent: 10:2033b4e49474 |
624 |/ parent: 10:2033b4e49474 |
625 | user: test |
625 | user: test |
626 | date: Thu Jan 01 00:00:00 1970 +0000 |
626 | date: Thu Jan 01 00:00:00 1970 +0000 |
627 | instability: phase-divergent |
627 | instability: phase-divergent |
628 | summary: add obsol_d''' |
628 | summary: add obsol_d''' |
737 | user: test |
737 | user: test |
738 | date: Thu Jan 01 00:00:00 1970 +0000 |
738 | date: Thu Jan 01 00:00:00 1970 +0000 |
739 | instability: orphan |
739 | instability: orphan |
740 | summary: add obsol_d'' |
740 | summary: add obsol_d'' |
741 | |
741 | |
742 | o changeset: 15:50f11e5e3a63 |
742 | * changeset: 15:50f11e5e3a63 |
743 | | parent: 11:9468a5f5d8b2 |
743 | | parent: 11:9468a5f5d8b2 |
744 | | user: test |
744 | | user: test |
745 | | date: Thu Jan 01 00:00:00 1970 +0000 |
745 | | date: Thu Jan 01 00:00:00 1970 +0000 |
746 | | instability: content-divergent |
746 | | instability: content-divergent |
747 | | summary: add obsolet_conflicting_d |
747 | | summary: add obsolet_conflicting_d |
757 | | | user: test |
757 | | | user: test |
758 | | | date: Thu Jan 01 00:00:00 1970 +0000 |
758 | | | date: Thu Jan 01 00:00:00 1970 +0000 |
759 | | | obsolete: amended using amend as 14:705ab2a6b72e |
759 | | | obsolete: amended using amend as 14:705ab2a6b72e |
760 | | | summary: add f |
760 | | | summary: add f |
761 | | | |
761 | | | |
762 | | | o changeset: 12:6db5e282cb91 |
762 | | | * changeset: 12:6db5e282cb91 |
763 | | |/ parent: 10:2033b4e49474 |
763 | | |/ parent: 10:2033b4e49474 |
764 | | | user: test |
764 | | | user: test |
765 | | | date: Thu Jan 01 00:00:00 1970 +0000 |
765 | | | date: Thu Jan 01 00:00:00 1970 +0000 |
766 | | | instability: phase-divergent, content-divergent |
766 | | | instability: phase-divergent, content-divergent |
767 | | | summary: add obsol_d''' |
767 | | | summary: add obsol_d''' |