| changeset 37920 | ea63a2004d09 |
| parent 35711 | 35a0f6f31eef |
| child 38707 | 6b5ca1d0aa1e |
| 37919:7a97a622244d | 37920:ea63a2004d09 |
|---|---|
73 summary: ROOT |
73 summary: ROOT |
74 |
74 |
75 Check templates |
75 Check templates |
76 --------------- |
76 --------------- |
77 $ hg up 'desc(A0)' --hidden |
77 $ hg up 'desc(A0)' --hidden |
78 updating to a hidden changeset 471f378eab4c |
78 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
79 updated to hidden changeset 471f378eab4c |
|
79 (hidden revision '471f378eab4c' was rewritten as: d004c8f274b9) |
80 (hidden revision '471f378eab4c' was rewritten as: d004c8f274b9) |
80 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
81 |
81 |
82 Predecessors template should show current revision as it is the working copy |
82 Predecessors template should show current revision as it is the working copy |
83 $ hg tlog |
83 $ hg tlog |
84 o d004c8f274b9 |
84 o d004c8f274b9 |
85 | Predecessors: 1:471f378eab4c |
85 | Predecessors: 1:471f378eab4c |
146 user: test |
146 user: test |
147 date: Thu Jan 01 00:00:00 1970 +0000 |
147 date: Thu Jan 01 00:00:00 1970 +0000 |
148 summary: ROOT |
148 summary: ROOT |
149 |
149 |
150 $ hg up 'desc(A1)' --hidden |
150 $ hg up 'desc(A1)' --hidden |
151 updating to a hidden changeset a468dc9b3633 |
151 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
152 updated to hidden changeset a468dc9b3633 |
|
152 (hidden revision 'a468dc9b3633' was rewritten as: d004c8f274b9) |
153 (hidden revision 'a468dc9b3633' was rewritten as: d004c8f274b9) |
153 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
154 |
154 |
155 Predecessors template should show current revision as it is the working copy |
155 Predecessors template should show current revision as it is the working copy |
156 $ hg tlog |
156 $ hg tlog |
157 o d004c8f274b9 |
157 o d004c8f274b9 |
158 | Predecessors: 2:a468dc9b3633 |
158 | Predecessors: 2:a468dc9b3633 |
415 |
415 |
416 Check templates |
416 Check templates |
417 --------------- |
417 --------------- |
418 |
418 |
419 $ hg up 'obsolete()' --hidden |
419 $ hg up 'obsolete()' --hidden |
420 updating to a hidden changeset 471597cad322 |
420 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
421 updated to hidden changeset 471597cad322 |
|
421 (hidden revision '471597cad322' was split as: 337fec4d2edc, f257fde29c7a) |
422 (hidden revision '471597cad322' was split as: 337fec4d2edc, f257fde29c7a) |
422 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
423 |
423 |
424 Predecessors template should show current revision as it is the working copy |
424 Predecessors template should show current revision as it is the working copy |
425 $ hg tlog |
425 $ hg tlog |
426 o f257fde29c7a |
426 o f257fde29c7a |
427 | Predecessors: 1:471597cad322 |
427 | Predecessors: 1:471597cad322 |
625 |
625 |
626 Check templates |
626 Check templates |
627 --------------- |
627 --------------- |
628 |
628 |
629 $ hg up 'desc(A0)' --hidden |
629 $ hg up 'desc(A0)' --hidden |
630 updating to a hidden changeset 471f378eab4c |
630 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
631 updated to hidden changeset 471f378eab4c |
|
631 (hidden revision '471f378eab4c' was rewritten as: eb5a0daa2192) |
632 (hidden revision '471f378eab4c' was rewritten as: eb5a0daa2192) |
632 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
633 |
633 |
634 Predecessors template should show current revision as it is the working copy |
634 Predecessors template should show current revision as it is the working copy |
635 $ hg tlog |
635 $ hg tlog |
636 o eb5a0daa2192 |
636 o eb5a0daa2192 |
637 | Predecessors: 1:471f378eab4c |
637 | Predecessors: 1:471f378eab4c |
651 | @ 471f378eab4c |
651 | @ 471f378eab4c |
652 |/ Obsfate: rewritten as 3:eb5a0daa2192 by test (at 1970-01-01 00:00 +0000); |
652 |/ Obsfate: rewritten as 3:eb5a0daa2192 by test (at 1970-01-01 00:00 +0000); |
653 o ea207398892e |
653 o ea207398892e |
654 |
654 |
655 $ hg up 'desc(B0)' --hidden |
655 $ hg up 'desc(B0)' --hidden |
656 updating to a hidden changeset 0dec01379d3b |
656 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
657 updated to hidden changeset 0dec01379d3b |
|
657 (hidden revision '0dec01379d3b' was rewritten as: eb5a0daa2192) |
658 (hidden revision '0dec01379d3b' was rewritten as: eb5a0daa2192) |
658 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
659 |
659 |
660 Predecessors template should show both predecessors as they should be both |
660 Predecessors template should show both predecessors as they should be both |
661 displayed |
661 displayed |
662 $ hg tlog |
662 $ hg tlog |
663 o eb5a0daa2192 |
663 o eb5a0daa2192 |
818 user: test |
818 user: test |
819 date: Thu Jan 01 00:00:00 1970 +0000 |
819 date: Thu Jan 01 00:00:00 1970 +0000 |
820 summary: ROOT |
820 summary: ROOT |
821 |
821 |
822 $ hg update --hidden 'desc(A0)' |
822 $ hg update --hidden 'desc(A0)' |
823 updating to a hidden changeset 471f378eab4c |
823 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
824 updated to hidden changeset 471f378eab4c |
|
824 (hidden revision '471f378eab4c' was rewritten as: fdf9bde5129a) |
825 (hidden revision '471f378eab4c' was rewritten as: fdf9bde5129a) |
825 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
826 $ hg commit --amend -m "A2" |
826 $ hg commit --amend -m "A2" |
827 2 new content-divergent changesets |
827 2 new content-divergent changesets |
828 $ hg log --hidden -G |
828 $ hg log --hidden -G |
829 @ changeset: 3:65b757b745b9 |
829 @ changeset: 3:65b757b745b9 |
830 | tag: tip |
830 | tag: tip |
892 |
892 |
893 Check templates |
893 Check templates |
894 --------------- |
894 --------------- |
895 |
895 |
896 $ hg up 'desc(A0)' --hidden |
896 $ hg up 'desc(A0)' --hidden |
897 updating to a hidden changeset 471f378eab4c |
897 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
898 updated to hidden changeset 471f378eab4c |
|
898 (hidden revision '471f378eab4c' has diverged) |
899 (hidden revision '471f378eab4c' has diverged) |
899 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
900 |
900 |
901 Predecessors template should show current revision as it is the working copy |
901 Predecessors template should show current revision as it is the working copy |
902 $ hg tlog |
902 $ hg tlog |
903 * 019fadeab383 |
903 * 019fadeab383 |
904 | Predecessors: 1:471f378eab4c |
904 | Predecessors: 1:471f378eab4c |
1159 |
1159 |
1160 Check templates |
1160 Check templates |
1161 --------------- |
1161 --------------- |
1162 |
1162 |
1163 $ hg up 'desc(A0)' --hidden |
1163 $ hg up 'desc(A0)' --hidden |
1164 updating to a hidden changeset 471f378eab4c |
1164 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
1165 updated to hidden changeset 471f378eab4c |
|
1165 (hidden revision '471f378eab4c' was rewritten as: eb5a0daa2192) |
1166 (hidden revision '471f378eab4c' was rewritten as: eb5a0daa2192) |
1166 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
1167 |
1167 |
1168 Predecessors template should show current revision as it is the working copy |
1168 Predecessors template should show current revision as it is the working copy |
1169 $ hg tlog |
1169 $ hg tlog |
1170 o eb5a0daa2192 |
1170 o eb5a0daa2192 |
1171 | Predecessors: 1:471f378eab4c |
1171 | Predecessors: 1:471f378eab4c |
1185 | @ 471f378eab4c |
1185 | @ 471f378eab4c |
1186 |/ Obsfate: rewritten as 4:eb5a0daa2192 by test (at 1970-01-01 00:00 +0000); |
1186 |/ Obsfate: rewritten as 4:eb5a0daa2192 by test (at 1970-01-01 00:00 +0000); |
1187 o ea207398892e |
1187 o ea207398892e |
1188 |
1188 |
1189 $ hg up 'desc(B0)' --hidden |
1189 $ hg up 'desc(B0)' --hidden |
1190 updating to a hidden changeset 0dec01379d3b |
1190 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
1191 updated to hidden changeset 0dec01379d3b |
|
1191 (hidden revision '0dec01379d3b' was rewritten as: eb5a0daa2192) |
1192 (hidden revision '0dec01379d3b' was rewritten as: eb5a0daa2192) |
1192 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
1193 |
1193 |
1194 Predecessors template should both predecessors as they are visible |
1194 Predecessors template should both predecessors as they are visible |
1195 $ hg tlog |
1195 $ hg tlog |
1196 o eb5a0daa2192 |
1196 o eb5a0daa2192 |
1197 | Predecessors: 2:0dec01379d3b 1:471f378eab4c |
1197 | Predecessors: 2:0dec01379d3b 1:471f378eab4c |
1217 | x 471f378eab4c |
1217 | x 471f378eab4c |
1218 |/ Obsfate: rewritten as 4:eb5a0daa2192 by test (at 1970-01-01 00:00 +0000); |
1218 |/ Obsfate: rewritten as 4:eb5a0daa2192 by test (at 1970-01-01 00:00 +0000); |
1219 o ea207398892e |
1219 o ea207398892e |
1220 |
1220 |
1221 $ hg up 'desc(B1)' --hidden |
1221 $ hg up 'desc(B1)' --hidden |
1222 updating to a hidden changeset b7ea6d14e664 |
1222 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
1223 updated to hidden changeset b7ea6d14e664 |
|
1223 (hidden revision 'b7ea6d14e664' was rewritten as: eb5a0daa2192) |
1224 (hidden revision 'b7ea6d14e664' was rewritten as: eb5a0daa2192) |
1224 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
1225 |
1225 |
1226 Predecessors template should both predecessors as they are visible |
1226 Predecessors template should both predecessors as they are visible |
1227 $ hg tlog |
1227 $ hg tlog |
1228 o eb5a0daa2192 |
1228 o eb5a0daa2192 |
1229 | Predecessors: 1:471f378eab4c 3:b7ea6d14e664 |
1229 | Predecessors: 1:471f378eab4c 3:b7ea6d14e664 |
1621 | |
1621 | |
1622 o ea207398892e |
1622 o ea207398892e |
1623 |
1623 |
1624 |
1624 |
1625 $ hg up -r "desc(B0)" --hidden |
1625 $ hg up -r "desc(B0)" --hidden |
1626 updating to a hidden changeset 0dec01379d3b |
1626 2 files updated, 0 files merged, 1 files removed, 0 files unresolved |
1627 updated to hidden changeset 0dec01379d3b |
|
1627 (hidden revision '0dec01379d3b' is pruned) |
1628 (hidden revision '0dec01379d3b' is pruned) |
1628 2 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
1629 $ hg tlog |
1629 $ hg tlog |
1630 o f897c6137566 |
1630 o f897c6137566 |
1631 | Predecessors: 2:0dec01379d3b |
1631 | Predecessors: 2:0dec01379d3b |
1632 | semi-colon: 2:0dec01379d3b |
1632 | semi-colon: 2:0dec01379d3b |
1633 | json: ["0dec01379d3be6318c470ead31b1fe7ae7cb53d5"] |
1633 | json: ["0dec01379d3be6318c470ead31b1fe7ae7cb53d5"] |
2085 | x 471f378eab4c |
2085 | x 471f378eab4c |
2086 |/ Obsfate: [{"markers": [["471f378eab4c5e25f6c77f785b27c936efb22874", ["0dec01379d3be6318c470ead31b1fe7ae7cb53d5"], 0, [["user", "test"]], [0.0, 0], null]], "successors": ["0dec01379d3be6318c470ead31b1fe7ae7cb53d5"]}] |
2086 |/ Obsfate: [{"markers": [["471f378eab4c5e25f6c77f785b27c936efb22874", ["0dec01379d3be6318c470ead31b1fe7ae7cb53d5"], 0, [["user", "test"]], [0.0, 0], null]], "successors": ["0dec01379d3be6318c470ead31b1fe7ae7cb53d5"]}] |
2087 o ea207398892e |
2087 o ea207398892e |
2088 |
2088 |
2089 $ hg up --hidden 4 |
2089 $ hg up --hidden 4 |
2090 updating to a hidden changeset 9bd10a0775e4 |
2090 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
2091 updated to hidden changeset 9bd10a0775e4 |
|
2091 (hidden revision '9bd10a0775e4' has diverged) |
2092 (hidden revision '9bd10a0775e4' has diverged) |
2092 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
2093 $ hg rebase -r 7 -d 8 --config extensions.rebase= |
2093 $ hg rebase -r 7 -d 8 --config extensions.rebase= |
2094 rebasing 7:ba2ed02b0c9a "Add A,B,C" |
2094 rebasing 7:ba2ed02b0c9a "Add A,B,C" |
2095 $ hg tlog |
2095 $ hg tlog |
2096 * eceed8f98ffc |
2096 * eceed8f98ffc |
2097 | Predecessors: 4:9bd10a0775e4 |
2097 | Predecessors: 4:9bd10a0775e4 |
2331 $ hg commit --amend -m "A1" |
2331 $ hg commit --amend -m "A1" |
2332 $ hg debugobsolete --record-parent `getid "."` |
2332 $ hg debugobsolete --record-parent `getid "."` |
2333 obsoleted 1 changesets |
2333 obsoleted 1 changesets |
2334 |
2334 |
2335 $ hg up -r "desc(A0)" --hidden |
2335 $ hg up -r "desc(A0)" --hidden |
2336 updating to a hidden changeset 471f378eab4c |
2336 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
2337 updated to hidden changeset 471f378eab4c |
|
2337 (hidden revision '471f378eab4c' is pruned) |
2338 (hidden revision '471f378eab4c' is pruned) |
2338 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
2339 $ hg commit --amend -m "A2" |
2339 $ hg commit --amend -m "A2" |
2340 $ hg debugobsolete --record-parent `getid "."` |
2340 $ hg debugobsolete --record-parent `getid "."` |
2341 obsoleted 1 changesets |
2341 obsoleted 1 changesets |
2342 |
2342 |
2343 Check output |
2343 Check output |
2344 ------------ |
2344 ------------ |
2345 |
2345 |
2346 $ hg up "desc(A0)" --hidden |
2346 $ hg up "desc(A0)" --hidden |
2347 updating to a hidden changeset 471f378eab4c |
2347 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
2348 updated to hidden changeset 471f378eab4c |
|
2348 (hidden revision '471f378eab4c' is pruned) |
2349 (hidden revision '471f378eab4c' is pruned) |
2349 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
2350 $ hg tlog |
2350 $ hg tlog |
2351 @ 471f378eab4c |
2351 @ 471f378eab4c |
2352 | |
2352 | |
2353 o ea207398892e |
2353 o ea207398892e |
2354 |
2354 |
2497 |
2497 |
2498 Check templates |
2498 Check templates |
2499 --------------- |
2499 --------------- |
2500 |
2500 |
2501 $ hg up 'desc("A0")' --hidden |
2501 $ hg up 'desc("A0")' --hidden |
2502 updating to a hidden changeset 471597cad322 |
2502 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
2503 updated to hidden changeset 471597cad322 |
|
2503 (hidden revision '471597cad322' is pruned) |
2504 (hidden revision '471597cad322' is pruned) |
2504 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
2505 |
2505 |
2506 # todo: the obsfate output is not ideal |
2506 # todo: the obsfate output is not ideal |
2507 $ hg fatelog |
2507 $ hg fatelog |
2508 o 617adc3a144c |
2508 o 617adc3a144c |
2509 | |
2509 | |
2510 | @ 471597cad322 |
2510 | @ 471597cad322 |
2511 |/ Obsfate: pruned; |
2511 |/ Obsfate: pruned; |
2512 o ea207398892e |
2512 o ea207398892e |
2513 |
2513 |
2514 $ hg up -r 'desc("A2")' --hidden |
2514 $ hg up -r 'desc("A2")' --hidden |
2515 updating to a hidden changeset 0d0ef4bdf70e |
2515 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
2516 updated to hidden changeset 0d0ef4bdf70e |
|
2516 (hidden revision '0d0ef4bdf70e' is pruned) |
2517 (hidden revision '0d0ef4bdf70e' is pruned) |
2517 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
2518 |
2518 |
2519 $ hg fatelog --hidden |
2519 $ hg fatelog --hidden |
2520 @ 0d0ef4bdf70e |
2520 @ 0d0ef4bdf70e |
2521 | Obsfate: pruned by test (at 1970-01-01 00:00 +0000); |
2521 | Obsfate: pruned by test (at 1970-01-01 00:00 +0000); |
2522 o 617adc3a144c |
2522 o 617adc3a144c |