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