43 $ cd client |
43 $ cd client |
44 $ cat >> .hg/hgrc << EOF |
44 $ cat >> .hg/hgrc << EOF |
45 > [ui] |
45 > [ui] |
46 > user= Tutorial User |
46 > user= Tutorial User |
47 > EOF |
47 > EOF |
48 $ . "$TESTDIR/testlib/graphviz_setup.sh" #ignore |
|
49 |
48 |
50 Topic branches are lightweight branches which disappear when changes are |
49 Topic branches are lightweight branches which disappear when changes are |
51 finalized (moved to the public phase). They can help users to organize and share |
50 finalized (moved to the public phase). They can help users to organize and share |
52 their unfinished work. |
51 their unfinished work. |
53 |
52 |
61 tag: tip |
60 tag: tip |
62 user: test |
61 user: test |
63 date: Thu Jan 01 00:00:00 1970 +0000 |
62 date: Thu Jan 01 00:00:00 1970 +0000 |
64 summary: Shopping list |
63 summary: Shopping list |
65 |
64 |
66 $ hg graphviz -r "all()" --sphinx-directive --rankdir LR #ignore |
|
67 .. graphviz:: |
|
68 |
|
69 strict digraph { |
|
70 graph [rankdir=LR, |
|
71 splines=polyline |
|
72 ]; |
|
73 node [label="\N"]; |
|
74 0 [fillcolor="#7F7FFF", |
|
75 fixedsize=true, |
|
76 group=default, |
|
77 height=2, |
|
78 label="0: 38da43f0a2ea", |
|
79 pin=true, |
|
80 pos="1,0!", |
|
81 shape=circle, |
|
82 style=filled, |
|
83 width=2]; |
|
84 } |
|
85 |
65 |
86 We are about to make some additions to this list and would like to do them |
66 We are about to make some additions to this list and would like to do them |
87 within a topic. Creating a new topic is done using the ``topic`` command: |
67 within a topic. Creating a new topic is done using the ``topic`` command: |
88 |
68 |
89 $ hg topic food |
69 $ hg topic food |
108 user: test |
88 user: test |
109 date: Thu Jan 01 00:00:00 1970 +0000 |
89 date: Thu Jan 01 00:00:00 1970 +0000 |
110 summary: Shopping list |
90 summary: Shopping list |
111 |
91 |
112 |
92 |
113 $ hg graphviz -r "all()" --sphinx-directive --rankdir LR #ignore |
|
114 .. graphviz:: |
|
115 |
|
116 strict digraph { |
|
117 graph [rankdir=LR, |
|
118 splines=polyline |
|
119 ]; |
|
120 node [label="\N"]; |
|
121 0 [fillcolor="#7F7FFF", |
|
122 fixedsize=true, |
|
123 group=default, |
|
124 height=2, |
|
125 label="0: 38da43f0a2ea", |
|
126 pin=true, |
|
127 pos="1,0!", |
|
128 shape=circle, |
|
129 style=filled, |
|
130 width=2]; |
|
131 } |
|
132 |
|
133 Our next commit will be part of the active topic: |
93 Our next commit will be part of the active topic: |
134 |
94 |
135 $ cat >> shopping << EOF |
95 $ cat >> shopping << EOF |
136 > Egg |
96 > Egg |
137 > Suggar |
97 > Suggar |
148 user: test |
108 user: test |
149 date: Thu Jan 01 00:00:00 1970 +0000 |
109 date: Thu Jan 01 00:00:00 1970 +0000 |
150 summary: adding condiments |
110 summary: adding condiments |
151 |
111 |
152 |
112 |
153 $ hg graphviz -r "topic("food")" --sphinx-directive --rankdir LR #ignore |
|
154 .. graphviz:: |
|
155 |
|
156 strict digraph { |
|
157 graph [rankdir=LR, |
|
158 splines=polyline |
|
159 ]; |
|
160 node [label="\N"]; |
|
161 1 [fillcolor="#7F7FFF", |
|
162 fixedsize=true, |
|
163 group=default, |
|
164 height=2, |
|
165 label="1: 13900241408b", |
|
166 pin=true, |
|
167 pos="1,1!", |
|
168 shape=pentagon, |
|
169 style=filled, |
|
170 width=2]; |
|
171 } |
|
172 |
|
173 And future commits will be part of that topic too: |
113 And future commits will be part of that topic too: |
174 |
114 |
175 $ cat >> shopping << EOF |
115 $ cat >> shopping << EOF |
176 > Bananas |
116 > Bananas |
177 > Pear |
117 > Pear |
193 ~ user: test |
133 ~ user: test |
194 date: Thu Jan 01 00:00:00 1970 +0000 |
134 date: Thu Jan 01 00:00:00 1970 +0000 |
195 summary: adding condiments |
135 summary: adding condiments |
196 |
136 |
197 |
137 |
198 $ hg graphviz -r "topic("food")" --sphinx-directive --rankdir LR #ignore |
|
199 .. graphviz:: |
|
200 |
|
201 strict digraph { |
|
202 graph [rankdir=LR, |
|
203 splines=polyline |
|
204 ]; |
|
205 node [label="\N"]; |
|
206 1 [fillcolor="#7F7FFF", |
|
207 fixedsize=true, |
|
208 group=default, |
|
209 height=2, |
|
210 label="1: 13900241408b", |
|
211 pin=true, |
|
212 pos="1,1!", |
|
213 shape=pentagon, |
|
214 style=filled, |
|
215 width=2]; |
|
216 2 [fillcolor="#7F7FFF", |
|
217 fixedsize=true, |
|
218 group=default, |
|
219 height=2, |
|
220 label="2: 287de11b401f", |
|
221 pin=true, |
|
222 pos="1,2!", |
|
223 shape=pentagon, |
|
224 style=filled, |
|
225 width=2]; |
|
226 1 -> 2; |
|
227 } |
|
228 |
|
229 We can get a compact view of the content of our topic using the ``stack`` |
138 We can get a compact view of the content of our topic using the ``stack`` |
230 command: |
139 command: |
231 |
140 |
232 $ hg stack |
141 $ hg stack |
233 ### topic: food |
142 ### topic: food |
264 @ changeset: 0:38da43f0a2ea |
173 @ changeset: 0:38da43f0a2ea |
265 user: test |
174 user: test |
266 date: Thu Jan 01 00:00:00 1970 +0000 |
175 date: Thu Jan 01 00:00:00 1970 +0000 |
267 summary: Shopping list |
176 summary: Shopping list |
268 |
177 |
269 |
|
270 $ hg graphviz -r "all()" --sphinx-directive --rankdir LR #ignore |
|
271 .. graphviz:: |
|
272 |
|
273 strict digraph { |
|
274 graph [rankdir=LR, |
|
275 splines=polyline |
|
276 ]; |
|
277 node [label="\N"]; |
|
278 0 [fillcolor="#7F7FFF", |
|
279 fixedsize=true, |
|
280 group=default, |
|
281 height=2, |
|
282 label="0: 38da43f0a2ea", |
|
283 pin=true, |
|
284 pos="1,0!", |
|
285 shape=circle, |
|
286 style=filled, |
|
287 width=2]; |
|
288 1 [fillcolor="#7F7FFF", |
|
289 fixedsize=true, |
|
290 group=default, |
|
291 height=2, |
|
292 label="1: 13900241408b", |
|
293 pin=true, |
|
294 pos="1,1!", |
|
295 shape=pentagon, |
|
296 style=filled, |
|
297 width=2]; |
|
298 0 -> 1; |
|
299 2 [fillcolor="#7F7FFF", |
|
300 fixedsize=true, |
|
301 group=default, |
|
302 height=2, |
|
303 label="2: 287de11b401f", |
|
304 pin=true, |
|
305 pos="1,2!", |
|
306 shape=pentagon, |
|
307 style=filled, |
|
308 width=2]; |
|
309 1 -> 2; |
|
310 } |
|
311 And updating back to the topic reactivates it: |
178 And updating back to the topic reactivates it: |
312 |
179 |
313 $ hg update food |
180 $ hg update food |
314 switching to topic food |
181 switching to topic food |
315 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
182 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
384 o changeset: 0:38da43f0a2ea |
251 o changeset: 0:38da43f0a2ea |
385 user: test |
252 user: test |
386 date: Thu Jan 01 00:00:00 1970 +0000 |
253 date: Thu Jan 01 00:00:00 1970 +0000 |
387 summary: Shopping list |
254 summary: Shopping list |
388 |
255 |
389 $ hg graphviz -r "all()" --sphinx-directive --rankdir LR #ignore |
|
390 .. graphviz:: |
|
391 |
|
392 strict digraph { |
|
393 graph [rankdir=LR, |
|
394 splines=polyline |
|
395 ]; |
|
396 node [label="\N"]; |
|
397 0 [fillcolor="#7F7FFF", |
|
398 fixedsize=true, |
|
399 group=default, |
|
400 height=2, |
|
401 label="0: 38da43f0a2ea", |
|
402 pin=true, |
|
403 pos="1,0!", |
|
404 shape=circle, |
|
405 style=filled, |
|
406 width=2]; |
|
407 1 [fillcolor="#7F7FFF", |
|
408 fixedsize=true, |
|
409 group=default, |
|
410 height=2, |
|
411 label="1: 13900241408b", |
|
412 pin=true, |
|
413 pos="1,1!", |
|
414 shape=pentagon, |
|
415 style=filled, |
|
416 width=2]; |
|
417 0 -> 1; |
|
418 3 [fillcolor="#7F7FFF", |
|
419 fixedsize=true, |
|
420 group=default, |
|
421 height=2, |
|
422 label="3: 6104862e8b84", |
|
423 pin=true, |
|
424 pos="1,3!", |
|
425 shape=circle, |
|
426 style=filled, |
|
427 width=2]; |
|
428 0 -> 3; |
|
429 2 [fillcolor="#7F7FFF", |
|
430 fixedsize=true, |
|
431 group=default, |
|
432 height=2, |
|
433 label="2: 287de11b401f", |
|
434 pin=true, |
|
435 pos="1,2!", |
|
436 shape=pentagon, |
|
437 style=filled, |
|
438 width=2]; |
|
439 1 -> 2; |
|
440 } |
|
441 |
256 |
442 The topic head will not be considered when merging from the new head of the |
257 The topic head will not be considered when merging from the new head of the |
443 branch: |
258 branch: |
444 |
259 |
445 $ hg update default |
260 $ hg update default |
486 o changeset: 0:38da43f0a2ea |
301 o changeset: 0:38da43f0a2ea |
487 user: test |
302 user: test |
488 date: Thu Jan 01 00:00:00 1970 +0000 |
303 date: Thu Jan 01 00:00:00 1970 +0000 |
489 summary: Shopping list |
304 summary: Shopping list |
490 |
305 |
491 $ hg graphviz -r "all()" --sphinx-directive --rankdir LR #ignore |
|
492 .. graphviz:: |
|
493 |
|
494 strict digraph { |
|
495 graph [rankdir=LR, |
|
496 splines=polyline |
|
497 ]; |
|
498 node [label="\N"]; |
|
499 0 [fillcolor="#7F7FFF", |
|
500 fixedsize=true, |
|
501 group=default, |
|
502 height=2, |
|
503 label="0: 38da43f0a2ea", |
|
504 pin=true, |
|
505 pos="1,0!", |
|
506 shape=circle, |
|
507 style=filled, |
|
508 width=2]; |
|
509 3 [fillcolor="#7F7FFF", |
|
510 fixedsize=true, |
|
511 group=default, |
|
512 height=2, |
|
513 label="3: 6104862e8b84", |
|
514 pin=true, |
|
515 pos="1,3!", |
|
516 shape=circle, |
|
517 style=filled, |
|
518 width=2]; |
|
519 0 -> 3; |
|
520 4 [fillcolor="#7F7FFF", |
|
521 fixedsize=true, |
|
522 group=default, |
|
523 height=2, |
|
524 label="4: 4011b46eeb33", |
|
525 pin=true, |
|
526 pos="1,4!", |
|
527 shape=pentagon, |
|
528 style=filled, |
|
529 width=2]; |
|
530 3 -> 4; |
|
531 5 [fillcolor="#7F7FFF", |
|
532 fixedsize=true, |
|
533 group=default, |
|
534 height=2, |
|
535 label="5: 2d50db8b5b4c", |
|
536 pin=true, |
|
537 pos="1,5!", |
|
538 shape=pentagon, |
|
539 style=filled, |
|
540 width=2]; |
|
541 4 -> 5; |
|
542 } |
|
543 |
306 |
544 The topic information will disappear when we publish the changesets: |
307 The topic information will disappear when we publish the changesets: |
545 |
308 |
546 $ hg topic |
309 $ hg topic |
547 * food |
310 * food |
579 o changeset: 0:38da43f0a2ea |
342 o changeset: 0:38da43f0a2ea |
580 user: test |
343 user: test |
581 date: Thu Jan 01 00:00:00 1970 +0000 |
344 date: Thu Jan 01 00:00:00 1970 +0000 |
582 summary: Shopping list |
345 summary: Shopping list |
583 |
346 |
584 $ hg graphviz -r "all()" --sphinx-directive --rankdir LR #ignore |
|
585 .. graphviz:: |
|
586 |
|
587 strict digraph { |
|
588 graph [rankdir=LR, |
|
589 splines=polyline |
|
590 ]; |
|
591 node [label="\N"]; |
|
592 0 [fillcolor="#7F7FFF", |
|
593 fixedsize=true, |
|
594 group=default, |
|
595 height=2, |
|
596 label="0: 38da43f0a2ea", |
|
597 pin=true, |
|
598 pos="1,0!", |
|
599 shape=circle, |
|
600 style=filled, |
|
601 width=2]; |
|
602 3 [fillcolor="#7F7FFF", |
|
603 fixedsize=true, |
|
604 group=default, |
|
605 height=2, |
|
606 label="3: 6104862e8b84", |
|
607 pin=true, |
|
608 pos="1,3!", |
|
609 shape=circle, |
|
610 style=filled, |
|
611 width=2]; |
|
612 0 -> 3; |
|
613 4 [fillcolor="#7F7FFF", |
|
614 fixedsize=true, |
|
615 group=default, |
|
616 height=2, |
|
617 label="4: 4011b46eeb33", |
|
618 pin=true, |
|
619 pos="1,4!", |
|
620 shape=circle, |
|
621 style=filled, |
|
622 width=2]; |
|
623 3 -> 4; |
|
624 5 [fillcolor="#7F7FFF", |
|
625 fixedsize=true, |
|
626 group=default, |
|
627 height=2, |
|
628 label="5: 2d50db8b5b4c", |
|
629 pin=true, |
|
630 pos="1,5!", |
|
631 shape=circle, |
|
632 style=filled, |
|
633 width=2]; |
|
634 4 -> 5; |
|
635 } |
|
636 |
|
637 $ hg update default |
347 $ hg update default |
638 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
348 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
639 |
349 |
640 Working with Multiple Topics |
350 Working with Multiple Topics |
641 ============================ |
351 ============================ |
798 o changeset: 0:38da43f0a2ea |
508 o changeset: 0:38da43f0a2ea |
799 user: test |
509 user: test |
800 date: Thu Jan 01 00:00:00 1970 +0000 |
510 date: Thu Jan 01 00:00:00 1970 +0000 |
801 summary: Shopping list |
511 summary: Shopping list |
802 |
512 |
803 $ hg graphviz -r "all()" --sphinx-directive --rankdir LR #ignore |
|
804 .. graphviz:: |
|
805 |
|
806 strict digraph { |
|
807 graph [rankdir=LR, |
|
808 splines=polyline |
|
809 ]; |
|
810 node [label="\N"]; |
|
811 0 [fillcolor="#7F7FFF", |
|
812 fixedsize=true, |
|
813 group=default, |
|
814 height=2, |
|
815 label="0: 38da43f0a2ea", |
|
816 pin=true, |
|
817 pos="1,0!", |
|
818 shape=circle, |
|
819 style=filled, |
|
820 width=2]; |
|
821 3 [fillcolor="#7F7FFF", |
|
822 fixedsize=true, |
|
823 group=default, |
|
824 height=2, |
|
825 label="3: 6104862e8b84", |
|
826 pin=true, |
|
827 pos="1,3!", |
|
828 shape=circle, |
|
829 style=filled, |
|
830 width=2]; |
|
831 0 -> 3; |
|
832 4 [fillcolor="#7F7FFF", |
|
833 fixedsize=true, |
|
834 group=default, |
|
835 height=2, |
|
836 label="4: 4011b46eeb33", |
|
837 pin=true, |
|
838 pos="1,4!", |
|
839 shape=circle, |
|
840 style=filled, |
|
841 width=2]; |
|
842 3 -> 4; |
|
843 5 [fillcolor="#7F7FFF", |
|
844 fixedsize=true, |
|
845 group=default, |
|
846 height=2, |
|
847 label="5: 2d50db8b5b4c", |
|
848 pin=true, |
|
849 pos="1,5!", |
|
850 shape=circle, |
|
851 style=filled, |
|
852 width=2]; |
|
853 4 -> 5; |
|
854 6 [fillcolor="#7F7FFF", |
|
855 fixedsize=true, |
|
856 group=default, |
|
857 height=2, |
|
858 label="6: 183984ef46d1", |
|
859 pin=true, |
|
860 pos="1,6!", |
|
861 shape=pentagon, |
|
862 style=filled, |
|
863 width=2]; |
|
864 5 -> 6; |
|
865 9 [fillcolor="#7F7FFF", |
|
866 fixedsize=true, |
|
867 group=default, |
|
868 height=2, |
|
869 label="9: 8dfa45bd5e0c", |
|
870 pin=true, |
|
871 pos="1,9!", |
|
872 shape=pentagon, |
|
873 style=filled, |
|
874 width=2]; |
|
875 5 -> 9; |
|
876 11 [fillcolor="#7F7FFF", |
|
877 fixedsize=true, |
|
878 group=default, |
|
879 height=2, |
|
880 label="11: f2d6cacc6115", |
|
881 pin=true, |
|
882 pos="1,11!", |
|
883 shape=circle, |
|
884 style=filled, |
|
885 width=2]; |
|
886 5 -> 11; |
|
887 7 [fillcolor="#7F7FFF", |
|
888 fixedsize=true, |
|
889 group=default, |
|
890 height=2, |
|
891 label="7: cffff85af537", |
|
892 pin=true, |
|
893 pos="1,7!", |
|
894 shape=pentagon, |
|
895 style=filled, |
|
896 width=2]; |
|
897 6 -> 7; |
|
898 8 [fillcolor="#7F7FFF", |
|
899 fixedsize=true, |
|
900 group=default, |
|
901 height=2, |
|
902 label="8: 34255b455dac", |
|
903 pin=true, |
|
904 pos="1,8!", |
|
905 shape=pentagon, |
|
906 style=filled, |
|
907 width=2]; |
|
908 7 -> 8; |
|
909 10 [fillcolor="#7F7FFF", |
|
910 fixedsize=true, |
|
911 group=default, |
|
912 height=2, |
|
913 label="10: 70dfa201ed73", |
|
914 pin=true, |
|
915 pos="1,10!", |
|
916 shape=pentagon, |
|
917 style=filled, |
|
918 width=2]; |
|
919 9 -> 10; |
|
920 12 [fillcolor="#7F7FFF", |
|
921 fixedsize=true, |
|
922 group=default, |
|
923 height=2, |
|
924 label="12: fbff9bc37a43", |
|
925 pin=true, |
|
926 pos="1,12!", |
|
927 shape=circle, |
|
928 style=filled, |
|
929 width=2]; |
|
930 11 -> 12; |
|
931 } |
|
932 |
|
933 $ hg rebase |
513 $ hg rebase |
934 rebasing 6:183984ef46d1 "Adding hammer" |
514 rebasing 6:183984ef46d1 "Adding hammer" |
935 merging shopping |
515 merging shopping |
936 switching to topic tools |
516 switching to topic tools |
937 rebasing 7:cffff85af537 "Adding saw" |
517 rebasing 7:cffff85af537 "Adding saw" |
1126 o changeset: 12:fbff9bc37a43 |
706 o changeset: 12:fbff9bc37a43 |
1127 | user: test |
707 | user: test |
1128 ~ date: Thu Jan 01 00:00:00 1970 +0000 |
708 ~ date: Thu Jan 01 00:00:00 1970 +0000 |
1129 summary: add a pair of shoes |
709 summary: add a pair of shoes |
1130 |
710 |
1131 |
|
1132 $ hg graphviz -r "t0::" --sphinx-directive --rankdir LR #ignore |
|
1133 .. graphviz:: |
|
1134 |
|
1135 strict digraph { |
|
1136 graph [rankdir=LR, |
|
1137 splines=polyline |
|
1138 ]; |
|
1139 node [label="\N"]; |
|
1140 12 [fillcolor="#7F7FFF", |
|
1141 fixedsize=true, |
|
1142 group=default, |
|
1143 height=2, |
|
1144 label="12: fbff9bc37a43", |
|
1145 pin=true, |
|
1146 pos="1,12!", |
|
1147 shape=circle, |
|
1148 style=filled, |
|
1149 width=2]; |
|
1150 13 [fillcolor="#DFDFFF", |
|
1151 fixedsize=true, |
|
1152 group=default_alt, |
|
1153 height=2, |
|
1154 label="13: a8ab3599d53d", |
|
1155 pin=true, |
|
1156 pos="2,13!", |
|
1157 shape=pentagon, |
|
1158 style="dotted, filled", |
|
1159 width=2]; |
|
1160 12 -> 13; |
|
1161 18 [fillcolor="#7F7FFF", |
|
1162 fixedsize=true, |
|
1163 group=default, |
|
1164 height=2, |
|
1165 label="18: b7509bd417f8", |
|
1166 pin=true, |
|
1167 pos="1,18!", |
|
1168 shape=pentagon, |
|
1169 style=filled, |
|
1170 width=2]; |
|
1171 12 -> 18; |
|
1172 16 [fillcolor="#7F7FFF", |
|
1173 fixedsize=true, |
|
1174 group=default, |
|
1175 height=2, |
|
1176 label="16: 20759cb47ff8", |
|
1177 pin=true, |
|
1178 pos="1,16!", |
|
1179 shape=circle, |
|
1180 style=filled, |
|
1181 width=2]; |
|
1182 12 -> 16; |
|
1183 13 -> 18 [arrowtail=dot, |
|
1184 dir=back, |
|
1185 minlen=0, |
|
1186 style=dotted]; |
|
1187 14 [fillcolor="#FF3535", |
|
1188 fixedsize=true, |
|
1189 group=default_alt, |
|
1190 height=2, |
|
1191 label="14: d4f97f32f8a1", |
|
1192 pin=true, |
|
1193 pos="2,14!", |
|
1194 shape=pentagon, |
|
1195 style=filled, |
|
1196 width=2]; |
|
1197 13 -> 14; |
|
1198 15 [fillcolor="#FF3535", |
|
1199 fixedsize=true, |
|
1200 group=default_alt, |
|
1201 height=2, |
|
1202 label="15: bb1e6254f532", |
|
1203 pin=true, |
|
1204 pos="2,15!", |
|
1205 shape=pentagon, |
|
1206 style=filled, |
|
1207 width=2]; |
|
1208 14 -> 15; |
|
1209 17 [fillcolor="#7F7FFF", |
|
1210 fixedsize=true, |
|
1211 group=default, |
|
1212 height=2, |
|
1213 label="17: 4cd7c1591a67", |
|
1214 pin=true, |
|
1215 pos="1,17!", |
|
1216 shape=circle, |
|
1217 style=filled, |
|
1218 width=2]; |
|
1219 16 -> 17; |
|
1220 } |
|
1221 |
|
1222 Fortunately stack shows you a better visualization: |
711 Fortunately stack shows you a better visualization: |
1223 |
712 |
1224 $ hg stack |
713 $ hg stack |
1225 ### topic: tools |
714 ### topic: tools |
1226 ### branch: default, 2 behind |
715 ### branch: default, 2 behind |
1296 o changeset: 12:fbff9bc37a43 |
785 o changeset: 12:fbff9bc37a43 |
1297 | user: test |
786 | user: test |
1298 ~ date: Thu Jan 01 00:00:00 1970 +0000 |
787 ~ date: Thu Jan 01 00:00:00 1970 +0000 |
1299 summary: add a pair of shoes |
788 summary: add a pair of shoes |
1300 |
789 |
1301 |
|
1302 $ hg graphviz -r "t0::" --sphinx-directive --rankdir LR #ignore |
|
1303 .. graphviz:: |
|
1304 |
|
1305 strict digraph { |
|
1306 graph [rankdir=LR, |
|
1307 splines=polyline |
|
1308 ]; |
|
1309 node [label="\N"]; |
|
1310 12 [fillcolor="#7F7FFF", |
|
1311 fixedsize=true, |
|
1312 group=default, |
|
1313 height=2, |
|
1314 label="12: fbff9bc37a43", |
|
1315 pin=true, |
|
1316 pos="1,12!", |
|
1317 shape=circle, |
|
1318 style=filled, |
|
1319 width=2]; |
|
1320 16 [fillcolor="#7F7FFF", |
|
1321 fixedsize=true, |
|
1322 group=default, |
|
1323 height=2, |
|
1324 label="16: 20759cb47ff8", |
|
1325 pin=true, |
|
1326 pos="1,16!", |
|
1327 shape=circle, |
|
1328 style=filled, |
|
1329 width=2]; |
|
1330 12 -> 16; |
|
1331 18 [fillcolor="#7F7FFF", |
|
1332 fixedsize=true, |
|
1333 group=default, |
|
1334 height=2, |
|
1335 label="18: b7509bd417f8", |
|
1336 pin=true, |
|
1337 pos="1,18!", |
|
1338 shape=pentagon, |
|
1339 style=filled, |
|
1340 width=2]; |
|
1341 12 -> 18; |
|
1342 17 [fillcolor="#7F7FFF", |
|
1343 fixedsize=true, |
|
1344 group=default, |
|
1345 height=2, |
|
1346 label="17: 4cd7c1591a67", |
|
1347 pin=true, |
|
1348 pos="1,17!", |
|
1349 shape=circle, |
|
1350 style=filled, |
|
1351 width=2]; |
|
1352 16 -> 17; |
|
1353 19 [fillcolor="#7F7FFF", |
|
1354 fixedsize=true, |
|
1355 group=default, |
|
1356 height=2, |
|
1357 label="19: d5c51ee5762a", |
|
1358 pin=true, |
|
1359 pos="1,19!", |
|
1360 shape=pentagon, |
|
1361 style=filled, |
|
1362 width=2]; |
|
1363 18 -> 19; |
|
1364 20 [fillcolor="#7F7FFF", |
|
1365 fixedsize=true, |
|
1366 group=default, |
|
1367 height=2, |
|
1368 label="20: bae3758e46bf", |
|
1369 pin=true, |
|
1370 pos="1,20!", |
|
1371 shape=pentagon, |
|
1372 style=filled, |
|
1373 width=2]; |
|
1374 19 -> 20; |
|
1375 } |
|
1376 Multi-headed stack |
790 Multi-headed stack |
1377 ------------------ |
791 ------------------ |
1378 |
792 |
1379 Stack is also very helpful when you have a multi-headed stack: |
793 Stack is also very helpful when you have a multi-headed stack: |
1380 |
794 |
1471 user: test |
885 user: test |
1472 date: Thu Jan 01 00:00:00 1970 +0000 |
886 date: Thu Jan 01 00:00:00 1970 +0000 |
1473 summary: Shopping list |
887 summary: Shopping list |
1474 |
888 |
1475 |
889 |
1476 $ hg graphviz -r "all()" --sphinx-directive --rankdir LR #ignore |
|
1477 .. graphviz:: |
|
1478 |
|
1479 strict digraph { |
|
1480 graph [rankdir=LR, |
|
1481 splines=polyline |
|
1482 ]; |
|
1483 node [label="\N"]; |
|
1484 0 [fillcolor="#7F7FFF", |
|
1485 fixedsize=true, |
|
1486 group=default, |
|
1487 height=2, |
|
1488 label="0: 38da43f0a2ea", |
|
1489 pin=true, |
|
1490 pos="1,0!", |
|
1491 shape=circle, |
|
1492 style=filled, |
|
1493 width=2]; |
|
1494 3 [fillcolor="#7F7FFF", |
|
1495 fixedsize=true, |
|
1496 group=default, |
|
1497 height=2, |
|
1498 label="3: 6104862e8b84", |
|
1499 pin=true, |
|
1500 pos="1,3!", |
|
1501 shape=circle, |
|
1502 style=filled, |
|
1503 width=2]; |
|
1504 0 -> 3; |
|
1505 4 [fillcolor="#7F7FFF", |
|
1506 fixedsize=true, |
|
1507 group=default, |
|
1508 height=2, |
|
1509 label="4: 4011b46eeb33", |
|
1510 pin=true, |
|
1511 pos="1,4!", |
|
1512 shape=circle, |
|
1513 style=filled, |
|
1514 width=2]; |
|
1515 3 -> 4; |
|
1516 5 [fillcolor="#7F7FFF", |
|
1517 fixedsize=true, |
|
1518 group=default, |
|
1519 height=2, |
|
1520 label="5: 2d50db8b5b4c", |
|
1521 pin=true, |
|
1522 pos="1,5!", |
|
1523 shape=circle, |
|
1524 style=filled, |
|
1525 width=2]; |
|
1526 4 -> 5; |
|
1527 11 [fillcolor="#7F7FFF", |
|
1528 fixedsize=true, |
|
1529 group=default, |
|
1530 height=2, |
|
1531 label="11: f2d6cacc6115", |
|
1532 pin=true, |
|
1533 pos="1,11!", |
|
1534 shape=circle, |
|
1535 style=filled, |
|
1536 width=2]; |
|
1537 5 -> 11; |
|
1538 12 [fillcolor="#7F7FFF", |
|
1539 fixedsize=true, |
|
1540 group=default, |
|
1541 height=2, |
|
1542 label="12: fbff9bc37a43", |
|
1543 pin=true, |
|
1544 pos="1,12!", |
|
1545 shape=circle, |
|
1546 style=filled, |
|
1547 width=2]; |
|
1548 11 -> 12; |
|
1549 16 [fillcolor="#7F7FFF", |
|
1550 fixedsize=true, |
|
1551 group=default, |
|
1552 height=2, |
|
1553 label="16: 20759cb47ff8", |
|
1554 pin=true, |
|
1555 pos="1,16!", |
|
1556 shape=circle, |
|
1557 style=filled, |
|
1558 width=2]; |
|
1559 12 -> 16; |
|
1560 18 [fillcolor="#7F7FFF", |
|
1561 fixedsize=true, |
|
1562 group=default, |
|
1563 height=2, |
|
1564 label="18: b7509bd417f8", |
|
1565 pin=true, |
|
1566 pos="1,18!", |
|
1567 shape=pentagon, |
|
1568 style=filled, |
|
1569 width=2]; |
|
1570 12 -> 18; |
|
1571 17 [fillcolor="#7F7FFF", |
|
1572 fixedsize=true, |
|
1573 group=default, |
|
1574 height=2, |
|
1575 label="17: 4cd7c1591a67", |
|
1576 pin=true, |
|
1577 pos="1,17!", |
|
1578 shape=circle, |
|
1579 style=filled, |
|
1580 width=2]; |
|
1581 16 -> 17; |
|
1582 19 [fillcolor="#7F7FFF", |
|
1583 fixedsize=true, |
|
1584 group=default, |
|
1585 height=2, |
|
1586 label="19: d5c51ee5762a", |
|
1587 pin=true, |
|
1588 pos="1,19!", |
|
1589 shape=pentagon, |
|
1590 style=filled, |
|
1591 width=2]; |
|
1592 18 -> 19; |
|
1593 21 [fillcolor="#7F7FFF", |
|
1594 fixedsize=true, |
|
1595 group=default, |
|
1596 height=2, |
|
1597 label="21: f936c6da9d61", |
|
1598 pin=true, |
|
1599 pos="1,21!", |
|
1600 shape=pentagon, |
|
1601 style=filled, |
|
1602 width=2]; |
|
1603 18 -> 21; |
|
1604 20 [fillcolor="#7F7FFF", |
|
1605 fixedsize=true, |
|
1606 group=default, |
|
1607 height=2, |
|
1608 label="20: bae3758e46bf", |
|
1609 pin=true, |
|
1610 pos="1,20!", |
|
1611 shape=pentagon, |
|
1612 style=filled, |
|
1613 width=2]; |
|
1614 19 -> 20; |
|
1615 } |
|
1616 |
|
1617 $ hg up t4 |
890 $ hg up t4 |
1618 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
891 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
1619 |
892 |
1620 $ hg rebase |
893 $ hg rebase |
1621 rebasing 19:d5c51ee5762a "Adding saw" |
894 rebasing 19:d5c51ee5762a "Adding saw" |