equal
deleted
inserted
replaced
62 summary: ROOT |
62 summary: ROOT |
63 |
63 |
64 Check templates |
64 Check templates |
65 --------------- |
65 --------------- |
66 $ hg up 'desc(A0)' --hidden |
66 $ hg up 'desc(A0)' --hidden |
67 updating to a hidden changeset 471f378eab4c |
|
68 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
67 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
69 working directory parent is obsolete! (471f378eab4c) |
68 working directory parent is obsolete! (471f378eab4c) |
70 (use 'hg evolve' to update to its successor: d004c8f274b9) |
69 (use 'hg evolve' to update to its successor: d004c8f274b9) |
71 |
70 |
72 Precursors template should show current revision as it is the working copy |
71 Precursors template should show current revision as it is the working copy |
154 |/ |
153 |/ |
155 o "" |
154 o "" |
156 |
155 |
157 |
156 |
158 $ hg up 'desc(A1)' --hidden |
157 $ hg up 'desc(A1)' --hidden |
159 updating to a hidden changeset a468dc9b3633 |
|
160 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
158 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
161 working directory parent is obsolete! (a468dc9b3633) |
159 working directory parent is obsolete! (a468dc9b3633) |
162 (use 'hg evolve' to update to its successor: d004c8f274b9) |
160 (use 'hg evolve' to update to its successor: d004c8f274b9) |
163 |
161 |
164 Precursors template should show current revision as it is the working copy |
162 Precursors template should show current revision as it is the working copy |
339 |
337 |
340 Check templates |
338 Check templates |
341 --------------- |
339 --------------- |
342 |
340 |
343 $ hg up 'obsolete()' --hidden |
341 $ hg up 'obsolete()' --hidden |
344 updating to a hidden changeset 471597cad322 |
|
345 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
342 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
346 working directory parent is obsolete! (471597cad322) |
343 working directory parent is obsolete! (471597cad322) |
347 (use 'hg evolve' to update to its tipmost successor: 337fec4d2edc, f257fde29c7a) |
344 (use 'hg evolve' to update to its tipmost successor: 337fec4d2edc, f257fde29c7a) |
348 |
345 |
349 Precursors template should show current revision as it is the working copy |
346 Precursors template should show current revision as it is the working copy |
479 |
476 |
480 Check templates |
477 Check templates |
481 --------------- |
478 --------------- |
482 |
479 |
483 $ hg up 'desc(A0)' --hidden |
480 $ hg up 'desc(A0)' --hidden |
484 updating to a hidden changeset 471f378eab4c |
|
485 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
481 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
486 working directory parent is obsolete! (471f378eab4c) |
482 working directory parent is obsolete! (471f378eab4c) |
487 (use 'hg evolve' to update to its successor: eb5a0daa2192) |
483 (use 'hg evolve' to update to its successor: eb5a0daa2192) |
488 |
484 |
489 Precursors template should show current revision as it is the working copy |
485 Precursors template should show current revision as it is the working copy |
505 |/ Obsfate: rewritten as 3:eb5a0daa2192 |
501 |/ Obsfate: rewritten as 3:eb5a0daa2192 |
506 | |
502 | |
507 o ea207398892e |
503 o ea207398892e |
508 |
504 |
509 $ hg up 'desc(B0)' --hidden |
505 $ hg up 'desc(B0)' --hidden |
510 updating to a hidden changeset 0dec01379d3b |
|
511 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
506 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
512 working directory parent is obsolete! (0dec01379d3b) |
507 working directory parent is obsolete! (0dec01379d3b) |
513 (use 'hg evolve' to update to its successor: eb5a0daa2192) |
508 (use 'hg evolve' to update to its successor: eb5a0daa2192) |
514 |
509 |
515 Precursors template should show both precursors as they should be both |
510 Precursors template should show both precursors as they should be both |
621 user: test |
616 user: test |
622 date: Thu Jan 01 00:00:00 1970 +0000 |
617 date: Thu Jan 01 00:00:00 1970 +0000 |
623 summary: ROOT |
618 summary: ROOT |
624 |
619 |
625 $ hg update --hidden 'desc(A0)' |
620 $ hg update --hidden 'desc(A0)' |
626 updating to a hidden changeset 471f378eab4c |
|
627 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
621 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
628 working directory parent is obsolete! (471f378eab4c) |
622 working directory parent is obsolete! (471f378eab4c) |
629 (use 'hg evolve' to update to its successor: fdf9bde5129a) |
623 (use 'hg evolve' to update to its successor: fdf9bde5129a) |
630 $ hg amend -m "A2" |
624 $ hg amend -m "A2" |
631 2 new content-divergent changesets |
625 2 new content-divergent changesets |
661 |
655 |
662 Check templates |
656 Check templates |
663 --------------- |
657 --------------- |
664 |
658 |
665 $ hg up 'desc(A0)' --hidden |
659 $ hg up 'desc(A0)' --hidden |
666 updating to a hidden changeset 471f378eab4c |
|
667 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
660 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
668 working directory parent is obsolete! (471f378eab4c) |
661 working directory parent is obsolete! (471f378eab4c) |
669 (471f378eab4c has diverged, use 'hg evolve --list --content-divergent' to resolve the issue) |
662 (471f378eab4c has diverged, use 'hg evolve --list --content-divergent' to resolve the issue) |
670 |
663 |
671 Precursors template should show current revision as it is the working copy |
664 Precursors template should show current revision as it is the working copy |
836 |
829 |
837 Check templates |
830 Check templates |
838 --------------- |
831 --------------- |
839 |
832 |
840 $ hg up 'desc(A0)' --hidden |
833 $ hg up 'desc(A0)' --hidden |
841 updating to a hidden changeset 471f378eab4c |
|
842 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
834 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
843 working directory parent is obsolete! (471f378eab4c) |
835 working directory parent is obsolete! (471f378eab4c) |
844 (use 'hg evolve' to update to its successor: eb5a0daa2192) |
836 (use 'hg evolve' to update to its successor: eb5a0daa2192) |
845 $ hg tlog |
837 $ hg tlog |
846 o eb5a0daa2192 |
838 o eb5a0daa2192 |
860 |/ Obsfate: rewritten as 4:eb5a0daa2192 |
852 |/ Obsfate: rewritten as 4:eb5a0daa2192 |
861 | |
853 | |
862 o ea207398892e |
854 o ea207398892e |
863 |
855 |
864 $ hg up 'desc(B0)' --hidden |
856 $ hg up 'desc(B0)' --hidden |
865 updating to a hidden changeset 0dec01379d3b |
|
866 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
857 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
867 working directory parent is obsolete! (0dec01379d3b) |
858 working directory parent is obsolete! (0dec01379d3b) |
868 (use 'hg evolve' to update to its successor: eb5a0daa2192) |
859 (use 'hg evolve' to update to its successor: eb5a0daa2192) |
869 $ hg tlog |
860 $ hg tlog |
870 o eb5a0daa2192 |
861 o eb5a0daa2192 |
893 | |
884 | |
894 o ea207398892e |
885 o ea207398892e |
895 |
886 |
896 |
887 |
897 $ hg up 'desc(B1)' --hidden |
888 $ hg up 'desc(B1)' --hidden |
898 updating to a hidden changeset b7ea6d14e664 |
|
899 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
889 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
900 working directory parent is obsolete! (b7ea6d14e664) |
890 working directory parent is obsolete! (b7ea6d14e664) |
901 (use 'hg evolve' to update to its successor: eb5a0daa2192) |
891 (use 'hg evolve' to update to its successor: eb5a0daa2192) |
902 $ hg tlog |
892 $ hg tlog |
903 o eb5a0daa2192 |
893 o eb5a0daa2192 |
1598 |
1588 |
1599 Check output |
1589 Check output |
1600 ------------ |
1590 ------------ |
1601 |
1591 |
1602 $ hg up "desc(A0)" --hidden |
1592 $ hg up "desc(A0)" --hidden |
1603 updating to a hidden changeset 471f378eab4c |
|
1604 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
1593 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
1605 working directory parent is obsolete! (471f378eab4c) |
1594 working directory parent is obsolete! (471f378eab4c) |
1606 (use 'hg evolve' to update to its parent successor) |
1595 (use 'hg evolve' to update to its parent successor) |
1607 $ hg tlog |
1596 $ hg tlog |
1608 @ 471f378eab4c |
1597 @ 471f378eab4c |