Fossil SCM

Fixed an alignment problem in Figure 6 of branching.wiki, and clarified the "back online" step in User C's lane.

wyoung 2019-06-21 12:41 trunk
Commit 8c44fd2baa57fbb836cd984bfff8bd573794eb0bd8b31bf1f1e28955d638a7b9
Parent eed1ff610b02860…
2 files changed +6 -6 +17 -17
~ www/branch06.graphml ~ www/branch06.svg
M www/branch06.graphml
+6 -6
--- www/branch06.graphml
+++ www/branch06.graphml
@@ -228,11 +228,11 @@
228228
 </data>
229229
 </node>
230230
 <node id="n0::n0::n12">
231231
 <data key="d6">
232232
 <y:ShapeNode>
233
- <y:Geometry height="30.0" width="30.0" x="129.0" y="-1249.0"/>
233
+ <y:Geometry height="30.0" width="30.0" x="120.0" y="-1249.0"/>
234234
 <y:Fill color="#FFFFFF" transparent="false"/>
235235
 <y:BorderStyle color="#000000" raised="false" type="line" width="2.0"/>
236236
 <y:NodeLabel alignment="center" autoSizePolicy="content" fontFamily="Dialog" fontSize="12" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" height="18.1328125" horizontalTextPosition="center" iconTextGap="4" modelName="custom" textColor="#000000" verticalTextPosition="bottom" visible="true" width="11.587890625" x="9.2060546875" xml:space="preserve" y="5.93359375">1<y:LabelModel><y:SmartNodeLabelModel distance="4.0"/></y:LabelModel><y:ModelParameter><y:SmartNodeLabelModelParameter labelRatioX="0.0" labelRatioY="0.0" nodeRatioX="0.0" nodeRatioY="0.0" offsetX="0.0" offsetY="0.0" upX="0.0" upY="-1.0"/></y:ModelParameter></y:NodeLabel>
237237
 <y:Shape type="ellipse"/>
238238
 </y:ShapeNode>
@@ -239,11 +239,11 @@
239239
 </data>
240240
 </node>
241241
 <node id="n0::n0::n13">
242242
 <data key="d6">
243243
 <y:ShapeNode>
244
- <y:Geometry height="30.0" width="30.0" x="189.0" y="-1206.5"/>
244
+ <y:Geometry height="30.0" width="30.0" x="180.0" y="-1206.5"/>
245245
 <y:Fill color="#C0C0C0" transparent="false"/>
246246
 <y:BorderStyle color="#000000" raised="false" type="line" width="2.0"/>
247247
 <y:NodeLabel alignment="center" autoSizePolicy="content" fontFamily="Dialog" fontSize="12" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" height="18.1328125" horizontalTextPosition="center" iconTextGap="4" modelName="custom" textColor="#000000" verticalTextPosition="bottom" visible="true" width="11.587890625" x="9.2060546875" xml:space="preserve" y="5.93359375">3<y:LabelModel><y:SmartNodeLabelModel distance="4.0"/></y:LabelModel><y:ModelParameter><y:SmartNodeLabelModelParameter labelRatioX="0.0" labelRatioY="0.0" nodeRatioX="0.0" nodeRatioY="0.0" offsetX="0.0" offsetY="0.0" upX="0.0" upY="-1.0"/></y:ModelParameter></y:NodeLabel>
248248
 <y:Shape type="ellipse"/>
249249
 </y:ShapeNode>
@@ -261,11 +261,11 @@
261261
 </data>
262262
 </node>
263263
 <node id="n0::n0::n15">
264264
 <data key="d6">
265265
 <y:ShapeNode>
266
- <y:Geometry height="30.0" width="30.0" x="189.0" y="-1249.0"/>
266
+ <y:Geometry height="30.0" width="30.0" x="180.0" y="-1249.0"/>
267267
 <y:Fill color="#FFFFFF" transparent="false"/>
268268
 <y:BorderStyle color="#000000" raised="false" type="line" width="2.0"/>
269269
 <y:NodeLabel alignment="center" autoSizePolicy="content" fontFamily="Dialog" fontSize="12" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" height="18.1328125" horizontalTextPosition="center" iconTextGap="4" modelName="custom" textColor="#000000" verticalTextPosition="bottom" visible="true" width="11.587890625" x="9.2060546875" xml:space="preserve" y="5.93359375">2<y:LabelModel><y:SmartNodeLabelModel distance="4.0"/></y:LabelModel><y:ModelParameter><y:SmartNodeLabelModelParameter labelRatioX="0.0" labelRatioY="0.0" nodeRatioX="0.0" nodeRatioY="0.0" offsetX="0.0" offsetY="0.0" upX="0.0" upY="-1.0"/></y:ModelParameter></y:NodeLabel>
270270
 <y:Shape type="ellipse"/>
271271
 </y:ShapeNode>
@@ -489,13 +489,13 @@
489489
 <data key="d10">
490490
 <y:PolyLineEdge>
491491
 <y:Path sx="0.0" sy="0.0" tx="0.0" ty="0.0"/>
492492
 <y:LineStyle color="#000000" type="line" width="1.0"/>
493493
 <y:Arrows source="none" target="standard"/>
494
- <y:EdgeLabel alignment="center" configuration="AutoFlippingLabel" distance="2.0" fontFamily="Dialog" fontSize="12" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" height="46.3984375" horizontalTextPosition="center" iconTextGap="4" modelName="two_pos" modelPosition="tail" preferredPlacement="anywhere" ratio="0.5" textColor="#000000" verticalTextPosition="bottom" visible="true" width="78.947265625" x="16.5263671875" xml:space="preserve" y="2.0">back online,
495
-syncs, learns
496
-of 3 &amp; 4<y:PreferredPlacementDescriptor angle="0.0" angleOffsetOnRightSide="0" angleReference="absolute" angleRotationOnRightSide="co" distance="-1.0" frozen="true" placement="anywhere" side="anywhere" sideReference="relative_to_edge_flow"/></y:EdgeLabel>
494
+ <y:EdgeLabel alignment="center" configuration="AutoFlippingLabel" distance="2.0" fontFamily="Dialog" fontSize="12" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" height="46.3984375" horizontalTextPosition="center" iconTextGap="4" modelName="two_pos" modelPosition="tail" preferredPlacement="anywhere" ratio="0.5" textColor="#000000" verticalTextPosition="bottom" visible="true" width="74.822265625" x="18.5888671875" xml:space="preserve" y="2.0">back online,
495
+pushes 5,
496
+pulls 3 &amp; 4<y:PreferredPlacementDescriptor angle="0.0" angleOffsetOnRightSide="0" angleReference="absolute" angleRotationOnRightSide="co" distance="-1.0" frozen="true" placement="anywhere" side="anywhere" sideReference="relative_to_edge_flow"/></y:EdgeLabel>
497497
 <y:BendStyle smoothed="false"/>
498498
 </y:PolyLineEdge>
499499
 </data>
500500
 </edge>
501501
 </graph>
502502
--- www/branch06.graphml
+++ www/branch06.graphml
@@ -228,11 +228,11 @@
228 </data>
229 </node>
230 <node id="n0::n0::n12">
231 <data key="d6">
232 <y:ShapeNode>
233 <y:Geometry height="30.0" width="30.0" x="129.0" y="-1249.0"/>
234 <y:Fill color="#FFFFFF" transparent="false"/>
235 <y:BorderStyle color="#000000" raised="false" type="line" width="2.0"/>
236 <y:NodeLabel alignment="center" autoSizePolicy="content" fontFamily="Dialog" fontSize="12" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" height="18.1328125" horizontalTextPosition="center" iconTextGap="4" modelName="custom" textColor="#000000" verticalTextPosition="bottom" visible="true" width="11.587890625" x="9.2060546875" xml:space="preserve" y="5.93359375">1<y:LabelModel><y:SmartNodeLabelModel distance="4.0"/></y:LabelModel><y:ModelParameter><y:SmartNodeLabelModelParameter labelRatioX="0.0" labelRatioY="0.0" nodeRatioX="0.0" nodeRatioY="0.0" offsetX="0.0" offsetY="0.0" upX="0.0" upY="-1.0"/></y:ModelParameter></y:NodeLabel>
237 <y:Shape type="ellipse"/>
238 </y:ShapeNode>
@@ -239,11 +239,11 @@
239 </data>
240 </node>
241 <node id="n0::n0::n13">
242 <data key="d6">
243 <y:ShapeNode>
244 <y:Geometry height="30.0" width="30.0" x="189.0" y="-1206.5"/>
245 <y:Fill color="#C0C0C0" transparent="false"/>
246 <y:BorderStyle color="#000000" raised="false" type="line" width="2.0"/>
247 <y:NodeLabel alignment="center" autoSizePolicy="content" fontFamily="Dialog" fontSize="12" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" height="18.1328125" horizontalTextPosition="center" iconTextGap="4" modelName="custom" textColor="#000000" verticalTextPosition="bottom" visible="true" width="11.587890625" x="9.2060546875" xml:space="preserve" y="5.93359375">3<y:LabelModel><y:SmartNodeLabelModel distance="4.0"/></y:LabelModel><y:ModelParameter><y:SmartNodeLabelModelParameter labelRatioX="0.0" labelRatioY="0.0" nodeRatioX="0.0" nodeRatioY="0.0" offsetX="0.0" offsetY="0.0" upX="0.0" upY="-1.0"/></y:ModelParameter></y:NodeLabel>
248 <y:Shape type="ellipse"/>
249 </y:ShapeNode>
@@ -261,11 +261,11 @@
261 </data>
262 </node>
263 <node id="n0::n0::n15">
264 <data key="d6">
265 <y:ShapeNode>
266 <y:Geometry height="30.0" width="30.0" x="189.0" y="-1249.0"/>
267 <y:Fill color="#FFFFFF" transparent="false"/>
268 <y:BorderStyle color="#000000" raised="false" type="line" width="2.0"/>
269 <y:NodeLabel alignment="center" autoSizePolicy="content" fontFamily="Dialog" fontSize="12" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" height="18.1328125" horizontalTextPosition="center" iconTextGap="4" modelName="custom" textColor="#000000" verticalTextPosition="bottom" visible="true" width="11.587890625" x="9.2060546875" xml:space="preserve" y="5.93359375">2<y:LabelModel><y:SmartNodeLabelModel distance="4.0"/></y:LabelModel><y:ModelParameter><y:SmartNodeLabelModelParameter labelRatioX="0.0" labelRatioY="0.0" nodeRatioX="0.0" nodeRatioY="0.0" offsetX="0.0" offsetY="0.0" upX="0.0" upY="-1.0"/></y:ModelParameter></y:NodeLabel>
270 <y:Shape type="ellipse"/>
271 </y:ShapeNode>
@@ -489,13 +489,13 @@
489 <data key="d10">
490 <y:PolyLineEdge>
491 <y:Path sx="0.0" sy="0.0" tx="0.0" ty="0.0"/>
492 <y:LineStyle color="#000000" type="line" width="1.0"/>
493 <y:Arrows source="none" target="standard"/>
494 <y:EdgeLabel alignment="center" configuration="AutoFlippingLabel" distance="2.0" fontFamily="Dialog" fontSize="12" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" height="46.3984375" horizontalTextPosition="center" iconTextGap="4" modelName="two_pos" modelPosition="tail" preferredPlacement="anywhere" ratio="0.5" textColor="#000000" verticalTextPosition="bottom" visible="true" width="78.947265625" x="16.5263671875" xml:space="preserve" y="2.0">back online,
495 syncs, learns
496 of 3 &amp; 4<y:PreferredPlacementDescriptor angle="0.0" angleOffsetOnRightSide="0" angleReference="absolute" angleRotationOnRightSide="co" distance="-1.0" frozen="true" placement="anywhere" side="anywhere" sideReference="relative_to_edge_flow"/></y:EdgeLabel>
497 <y:BendStyle smoothed="false"/>
498 </y:PolyLineEdge>
499 </data>
500 </edge>
501 </graph>
502
--- www/branch06.graphml
+++ www/branch06.graphml
@@ -228,11 +228,11 @@
228 </data>
229 </node>
230 <node id="n0::n0::n12">
231 <data key="d6">
232 <y:ShapeNode>
233 <y:Geometry height="30.0" width="30.0" x="120.0" y="-1249.0"/>
234 <y:Fill color="#FFFFFF" transparent="false"/>
235 <y:BorderStyle color="#000000" raised="false" type="line" width="2.0"/>
236 <y:NodeLabel alignment="center" autoSizePolicy="content" fontFamily="Dialog" fontSize="12" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" height="18.1328125" horizontalTextPosition="center" iconTextGap="4" modelName="custom" textColor="#000000" verticalTextPosition="bottom" visible="true" width="11.587890625" x="9.2060546875" xml:space="preserve" y="5.93359375">1<y:LabelModel><y:SmartNodeLabelModel distance="4.0"/></y:LabelModel><y:ModelParameter><y:SmartNodeLabelModelParameter labelRatioX="0.0" labelRatioY="0.0" nodeRatioX="0.0" nodeRatioY="0.0" offsetX="0.0" offsetY="0.0" upX="0.0" upY="-1.0"/></y:ModelParameter></y:NodeLabel>
237 <y:Shape type="ellipse"/>
238 </y:ShapeNode>
@@ -239,11 +239,11 @@
239 </data>
240 </node>
241 <node id="n0::n0::n13">
242 <data key="d6">
243 <y:ShapeNode>
244 <y:Geometry height="30.0" width="30.0" x="180.0" y="-1206.5"/>
245 <y:Fill color="#C0C0C0" transparent="false"/>
246 <y:BorderStyle color="#000000" raised="false" type="line" width="2.0"/>
247 <y:NodeLabel alignment="center" autoSizePolicy="content" fontFamily="Dialog" fontSize="12" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" height="18.1328125" horizontalTextPosition="center" iconTextGap="4" modelName="custom" textColor="#000000" verticalTextPosition="bottom" visible="true" width="11.587890625" x="9.2060546875" xml:space="preserve" y="5.93359375">3<y:LabelModel><y:SmartNodeLabelModel distance="4.0"/></y:LabelModel><y:ModelParameter><y:SmartNodeLabelModelParameter labelRatioX="0.0" labelRatioY="0.0" nodeRatioX="0.0" nodeRatioY="0.0" offsetX="0.0" offsetY="0.0" upX="0.0" upY="-1.0"/></y:ModelParameter></y:NodeLabel>
248 <y:Shape type="ellipse"/>
249 </y:ShapeNode>
@@ -261,11 +261,11 @@
261 </data>
262 </node>
263 <node id="n0::n0::n15">
264 <data key="d6">
265 <y:ShapeNode>
266 <y:Geometry height="30.0" width="30.0" x="180.0" y="-1249.0"/>
267 <y:Fill color="#FFFFFF" transparent="false"/>
268 <y:BorderStyle color="#000000" raised="false" type="line" width="2.0"/>
269 <y:NodeLabel alignment="center" autoSizePolicy="content" fontFamily="Dialog" fontSize="12" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" height="18.1328125" horizontalTextPosition="center" iconTextGap="4" modelName="custom" textColor="#000000" verticalTextPosition="bottom" visible="true" width="11.587890625" x="9.2060546875" xml:space="preserve" y="5.93359375">2<y:LabelModel><y:SmartNodeLabelModel distance="4.0"/></y:LabelModel><y:ModelParameter><y:SmartNodeLabelModelParameter labelRatioX="0.0" labelRatioY="0.0" nodeRatioX="0.0" nodeRatioY="0.0" offsetX="0.0" offsetY="0.0" upX="0.0" upY="-1.0"/></y:ModelParameter></y:NodeLabel>
270 <y:Shape type="ellipse"/>
271 </y:ShapeNode>
@@ -489,13 +489,13 @@
489 <data key="d10">
490 <y:PolyLineEdge>
491 <y:Path sx="0.0" sy="0.0" tx="0.0" ty="0.0"/>
492 <y:LineStyle color="#000000" type="line" width="1.0"/>
493 <y:Arrows source="none" target="standard"/>
494 <y:EdgeLabel alignment="center" configuration="AutoFlippingLabel" distance="2.0" fontFamily="Dialog" fontSize="12" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" height="46.3984375" horizontalTextPosition="center" iconTextGap="4" modelName="two_pos" modelPosition="tail" preferredPlacement="anywhere" ratio="0.5" textColor="#000000" verticalTextPosition="bottom" visible="true" width="74.822265625" x="18.5888671875" xml:space="preserve" y="2.0">back online,
495 pushes 5,
496 pulls 3 &amp; 4<y:PreferredPlacementDescriptor angle="0.0" angleOffsetOnRightSide="0" angleReference="absolute" angleRotationOnRightSide="co" distance="-1.0" frozen="true" placement="anywhere" side="anywhere" sideReference="relative_to_edge_flow"/></y:EdgeLabel>
497 <y:BendStyle smoothed="false"/>
498 </y:PolyLineEdge>
499 </data>
500 </edge>
501 </graph>
502
M www/branch06.svg
+17 -17
--- www/branch06.svg
+++ www/branch06.svg
@@ -141,36 +141,36 @@
141141
 <g text-rendering="geometricPrecision" stroke-miterlimit="1.45" stroke-width="2" shape-rendering="geometricPrecision" transform="matrix(1,0,0,1,-68,1311)" stroke-linecap="butt">
142142
 <circle fill="none" r="15" clip-path="url(#clipPath2)" cx="375" cy="-910.834"/>
143143
 <text x="371.2061" y="-906.2988" clip-path="url(#clipPath2)" font-family="sans-serif" stroke="none" stroke-width="1" xml:space="preserve">6</text>
144144
 </g>
145145
 <g fill="white" text-rendering="geometricPrecision" shape-rendering="geometricPrecision" transform="matrix(1,0,0,1,-68,1311)" stroke="white">
146
- <circle r="15" clip-path="url(#clipPath2)" cx="144" cy="-1234" stroke="none"/>
146
+ <circle r="15" clip-path="url(#clipPath2)" cx="135" cy="-1234" stroke="none"/>
147147
 </g>
148148
 <g text-rendering="geometricPrecision" stroke-miterlimit="1.45" stroke-width="2" shape-rendering="geometricPrecision" transform="matrix(1,0,0,1,-68,1311)" stroke-linecap="butt">
149
- <circle fill="none" r="15" clip-path="url(#clipPath2)" cx="144" cy="-1234"/>
150
- <text x="140.2061" y="-1229.4648" clip-path="url(#clipPath2)" font-family="sans-serif" stroke="none" stroke-width="1" xml:space="preserve">1</text>
149
+ <circle fill="none" r="15" clip-path="url(#clipPath2)" cx="135" cy="-1234"/>
150
+ <text x="131.2061" y="-1229.4648" clip-path="url(#clipPath2)" font-family="sans-serif" stroke="none" stroke-width="1" xml:space="preserve">1</text>
151151
 </g>
152152
 <g fill="silver" text-rendering="geometricPrecision" shape-rendering="geometricPrecision" transform="matrix(1,0,0,1,-68,1311)" stroke="silver">
153
- <circle r="15" clip-path="url(#clipPath2)" cx="204" cy="-1191.5" stroke="none"/>
153
+ <circle r="15" clip-path="url(#clipPath2)" cx="195" cy="-1191.5" stroke="none"/>
154154
 </g>
155155
 <g text-rendering="geometricPrecision" stroke-miterlimit="1.45" stroke-width="2" shape-rendering="geometricPrecision" transform="matrix(1,0,0,1,-68,1311)" stroke-linecap="butt">
156
- <circle fill="none" r="15" clip-path="url(#clipPath2)" cx="204" cy="-1191.5"/>
157
- <text x="200.2061" y="-1186.9648" clip-path="url(#clipPath2)" font-family="sans-serif" stroke="none" stroke-width="1" xml:space="preserve">3</text>
156
+ <circle fill="none" r="15" clip-path="url(#clipPath2)" cx="195" cy="-1191.5"/>
157
+ <text x="191.2061" y="-1186.9648" clip-path="url(#clipPath2)" font-family="sans-serif" stroke="none" stroke-width="1" xml:space="preserve">3</text>
158158
 </g>
159159
 <g fill="white" text-rendering="geometricPrecision" shape-rendering="geometricPrecision" transform="matrix(1,0,0,1,-68,1311)" stroke="white">
160160
 <ellipse rx="32" ry="15" clip-path="url(#clipPath2)" cx="474" cy="-1234" stroke="none"/>
161161
 </g>
162162
 <g text-rendering="geometricPrecision" stroke-miterlimit="1.45" stroke-width="2" shape-rendering="geometricPrecision" transform="matrix(1,0,0,1,-68,1311)" stroke-linecap="butt">
163163
 <ellipse rx="32" fill="none" ry="15" clip-path="url(#clipPath2)" cx="474" cy="-1234"/>
164164
 <text x="456.3047" y="-1229.4648" clip-path="url(#clipPath2)" font-family="sans-serif" stroke="none" stroke-width="1" xml:space="preserve">future</text>
165165
 </g>
166166
 <g fill="white" text-rendering="geometricPrecision" shape-rendering="geometricPrecision" transform="matrix(1,0,0,1,-68,1311)" stroke="white">
167
- <circle r="15" clip-path="url(#clipPath2)" cx="204" cy="-1234" stroke="none"/>
167
+ <circle r="15" clip-path="url(#clipPath2)" cx="195" cy="-1234" stroke="none"/>
168168
 </g>
169169
 <g text-rendering="geometricPrecision" stroke-miterlimit="1.45" stroke-width="2" shape-rendering="geometricPrecision" transform="matrix(1,0,0,1,-68,1311)" stroke-linecap="butt">
170
- <circle fill="none" r="15" clip-path="url(#clipPath2)" cx="204" cy="-1234"/>
171
- <text x="200.2061" y="-1229.4648" clip-path="url(#clipPath2)" font-family="sans-serif" stroke="none" stroke-width="1" xml:space="preserve">2</text>
170
+ <circle fill="none" r="15" clip-path="url(#clipPath2)" cx="195" cy="-1234"/>
171
+ <text x="191.2061" y="-1229.4648" clip-path="url(#clipPath2)" font-family="sans-serif" stroke="none" stroke-width="1" xml:space="preserve">2</text>
172172
 </g>
173173
 <g fill="white" text-rendering="geometricPrecision" shape-rendering="geometricPrecision" transform="matrix(1,0,0,1,-68,1311)" stroke="white">
174174
 <circle r="15" clip-path="url(#clipPath2)" cx="195" cy="-1005.667" stroke="none"/>
175175
 </g>
176176
 <g text-rendering="geometricPrecision" stroke-miterlimit="1.45" stroke-width="2" shape-rendering="geometricPrecision" transform="matrix(1,0,0,1,-68,1311)" stroke-linecap="butt">
@@ -215,25 +215,25 @@
215215
 <path d="M300 -910.834 L288 -915.834 L291 -910.834 L288 -905.834 Z" stroke-width="1" clip-path="url(#clipPath2)" stroke="none"/>
216216
 <path fill="none" d="M330 -910.834 L352 -910.834" stroke-width="1" clip-path="url(#clipPath2)"/>
217217
 <path d="M360 -910.834 L348 -915.834 L351 -910.834 L348 -905.834 Z" stroke-width="1" clip-path="url(#clipPath2)" stroke="none"/>
218218
 <path fill="none" d="M390 -910.834 L434 -910.834" stroke-width="1" clip-path="url(#clipPath2)"/>
219219
 <path d="M442 -910.834 L430 -915.834 L433 -910.834 L430 -905.834 Z" stroke-width="1" clip-path="url(#clipPath2)" stroke="none"/>
220
- <path fill="none" d="M156.2404 -1225.3297 L185.2314 -1204.7944" stroke-width="1" clip-path="url(#clipPath2)"/>
221
- <path d="M191.7596 -1200.1703 L184.8574 -1211.1866 L184.4154 -1205.3724 L179.0773 -1203.0264 Z" stroke-width="1" clip-path="url(#clipPath2)" stroke="none"/>
222
- <text x="143.248" y="-1200.7979" clip-path="url(#clipPath2)" font-family="sans-serif" stroke="none" stroke-width="1" xml:space="preserve">fork!</text>
223
- <path fill="none" d="M159 -1234 L181 -1234" stroke-width="1" clip-path="url(#clipPath2)"/>
224
- <path d="M189 -1234 L177 -1239 L180 -1234 L177 -1229 Z" stroke-width="1" clip-path="url(#clipPath2)" stroke="none"/>
225
- <path fill="none" d="M219 -1234 L434 -1234" stroke-width="1" clip-path="url(#clipPath2)"/>
220
+ <path fill="none" d="M147.2404 -1225.3297 L176.2314 -1204.7944" stroke-width="1" clip-path="url(#clipPath2)"/>
221
+ <path d="M182.7596 -1200.1703 L175.8574 -1211.1866 L175.4154 -1205.3724 L170.0773 -1203.0264 Z" stroke-width="1" clip-path="url(#clipPath2)" stroke="none"/>
222
+ <text x="134.248" y="-1200.7979" clip-path="url(#clipPath2)" font-family="sans-serif" stroke="none" stroke-width="1" xml:space="preserve">fork!</text>
223
+ <path fill="none" d="M150 -1234 L172 -1234" stroke-width="1" clip-path="url(#clipPath2)"/>
224
+ <path d="M180 -1234 L168 -1239 L171 -1234 L168 -1229 Z" stroke-width="1" clip-path="url(#clipPath2)" stroke="none"/>
225
+ <path fill="none" d="M210 -1234 L434 -1234" stroke-width="1" clip-path="url(#clipPath2)"/>
226226
 <path d="M442 -1234 L430 -1239 L433 -1234 L430 -1229 Z" stroke-width="1" clip-path="url(#clipPath2)" stroke="none"/>
227227
 <path fill="none" d="M210 -1005.667 L292 -1005.667" stroke-width="1" clip-path="url(#clipPath2)"/>
228228
 <path d="M300 -1005.667 L288 -1010.667 L291 -1005.667 L288 -1000.667 Z" stroke-width="1" clip-path="url(#clipPath2)" stroke="none"/>
229229
 <text x="220.6406" y="-1014.1982" clip-path="url(#clipPath2)" font-family="sans-serif" stroke="none" stroke-width="1" xml:space="preserve">goes offline</text>
230230
 <path fill="none" d="M150 -1005.667 L172 -1005.667" stroke-width="1" clip-path="url(#clipPath2)"/>
231231
 <path d="M180 -1005.667 L168 -1010.667 L171 -1005.667 L168 -1000.667 Z" stroke-width="1" clip-path="url(#clipPath2)" stroke="none"/>
232232
 <path fill="none" d="M330 -1005.667 L434 -1005.667" stroke-width="1" clip-path="url(#clipPath2)"/>
233233
 <path d="M442 -1005.667 L430 -1010.667 L433 -1005.667 L430 -1000.667 Z" stroke-width="1" clip-path="url(#clipPath2)" stroke="none"/>
234234
 <text x="350.5889" y="-990.0654" clip-path="url(#clipPath2)" font-family="sans-serif" stroke="none" stroke-width="1" xml:space="preserve">back online,</text>
235
- <text x="348.5264" y="-975.9326" clip-path="url(#clipPath2)" font-family="sans-serif" stroke="none" stroke-width="1" xml:space="preserve">syncs, learns</text>
236
- <text x="362.6416" y="-961.7998" clip-path="url(#clipPath2)" font-family="sans-serif" stroke="none" stroke-width="1" xml:space="preserve">of 3 &amp; 4</text>
235
+ <text x="357.7256" y="-975.9326" clip-path="url(#clipPath2)" font-family="sans-serif" stroke="none" stroke-width="1" xml:space="preserve">pushes 5,</text>
236
+ <text x="354.5059" y="-961.7998" clip-path="url(#clipPath2)" font-family="sans-serif" stroke="none" stroke-width="1" xml:space="preserve">pulls 3 &amp; 4</text>
237237
 </g>
238238
 </g>
239239
 </svg>
240240
--- www/branch06.svg
+++ www/branch06.svg
@@ -141,36 +141,36 @@
141 <g text-rendering="geometricPrecision" stroke-miterlimit="1.45" stroke-width="2" shape-rendering="geometricPrecision" transform="matrix(1,0,0,1,-68,1311)" stroke-linecap="butt">
142 <circle fill="none" r="15" clip-path="url(#clipPath2)" cx="375" cy="-910.834"/>
143 <text x="371.2061" y="-906.2988" clip-path="url(#clipPath2)" font-family="sans-serif" stroke="none" stroke-width="1" xml:space="preserve">6</text>
144 </g>
145 <g fill="white" text-rendering="geometricPrecision" shape-rendering="geometricPrecision" transform="matrix(1,0,0,1,-68,1311)" stroke="white">
146 <circle r="15" clip-path="url(#clipPath2)" cx="144" cy="-1234" stroke="none"/>
147 </g>
148 <g text-rendering="geometricPrecision" stroke-miterlimit="1.45" stroke-width="2" shape-rendering="geometricPrecision" transform="matrix(1,0,0,1,-68,1311)" stroke-linecap="butt">
149 <circle fill="none" r="15" clip-path="url(#clipPath2)" cx="144" cy="-1234"/>
150 <text x="140.2061" y="-1229.4648" clip-path="url(#clipPath2)" font-family="sans-serif" stroke="none" stroke-width="1" xml:space="preserve">1</text>
151 </g>
152 <g fill="silver" text-rendering="geometricPrecision" shape-rendering="geometricPrecision" transform="matrix(1,0,0,1,-68,1311)" stroke="silver">
153 <circle r="15" clip-path="url(#clipPath2)" cx="204" cy="-1191.5" stroke="none"/>
154 </g>
155 <g text-rendering="geometricPrecision" stroke-miterlimit="1.45" stroke-width="2" shape-rendering="geometricPrecision" transform="matrix(1,0,0,1,-68,1311)" stroke-linecap="butt">
156 <circle fill="none" r="15" clip-path="url(#clipPath2)" cx="204" cy="-1191.5"/>
157 <text x="200.2061" y="-1186.9648" clip-path="url(#clipPath2)" font-family="sans-serif" stroke="none" stroke-width="1" xml:space="preserve">3</text>
158 </g>
159 <g fill="white" text-rendering="geometricPrecision" shape-rendering="geometricPrecision" transform="matrix(1,0,0,1,-68,1311)" stroke="white">
160 <ellipse rx="32" ry="15" clip-path="url(#clipPath2)" cx="474" cy="-1234" stroke="none"/>
161 </g>
162 <g text-rendering="geometricPrecision" stroke-miterlimit="1.45" stroke-width="2" shape-rendering="geometricPrecision" transform="matrix(1,0,0,1,-68,1311)" stroke-linecap="butt">
163 <ellipse rx="32" fill="none" ry="15" clip-path="url(#clipPath2)" cx="474" cy="-1234"/>
164 <text x="456.3047" y="-1229.4648" clip-path="url(#clipPath2)" font-family="sans-serif" stroke="none" stroke-width="1" xml:space="preserve">future</text>
165 </g>
166 <g fill="white" text-rendering="geometricPrecision" shape-rendering="geometricPrecision" transform="matrix(1,0,0,1,-68,1311)" stroke="white">
167 <circle r="15" clip-path="url(#clipPath2)" cx="204" cy="-1234" stroke="none"/>
168 </g>
169 <g text-rendering="geometricPrecision" stroke-miterlimit="1.45" stroke-width="2" shape-rendering="geometricPrecision" transform="matrix(1,0,0,1,-68,1311)" stroke-linecap="butt">
170 <circle fill="none" r="15" clip-path="url(#clipPath2)" cx="204" cy="-1234"/>
171 <text x="200.2061" y="-1229.4648" clip-path="url(#clipPath2)" font-family="sans-serif" stroke="none" stroke-width="1" xml:space="preserve">2</text>
172 </g>
173 <g fill="white" text-rendering="geometricPrecision" shape-rendering="geometricPrecision" transform="matrix(1,0,0,1,-68,1311)" stroke="white">
174 <circle r="15" clip-path="url(#clipPath2)" cx="195" cy="-1005.667" stroke="none"/>
175 </g>
176 <g text-rendering="geometricPrecision" stroke-miterlimit="1.45" stroke-width="2" shape-rendering="geometricPrecision" transform="matrix(1,0,0,1,-68,1311)" stroke-linecap="butt">
@@ -215,25 +215,25 @@
215 <path d="M300 -910.834 L288 -915.834 L291 -910.834 L288 -905.834 Z" stroke-width="1" clip-path="url(#clipPath2)" stroke="none"/>
216 <path fill="none" d="M330 -910.834 L352 -910.834" stroke-width="1" clip-path="url(#clipPath2)"/>
217 <path d="M360 -910.834 L348 -915.834 L351 -910.834 L348 -905.834 Z" stroke-width="1" clip-path="url(#clipPath2)" stroke="none"/>
218 <path fill="none" d="M390 -910.834 L434 -910.834" stroke-width="1" clip-path="url(#clipPath2)"/>
219 <path d="M442 -910.834 L430 -915.834 L433 -910.834 L430 -905.834 Z" stroke-width="1" clip-path="url(#clipPath2)" stroke="none"/>
220 <path fill="none" d="M156.2404 -1225.3297 L185.2314 -1204.7944" stroke-width="1" clip-path="url(#clipPath2)"/>
221 <path d="M191.7596 -1200.1703 L184.8574 -1211.1866 L184.4154 -1205.3724 L179.0773 -1203.0264 Z" stroke-width="1" clip-path="url(#clipPath2)" stroke="none"/>
222 <text x="143.248" y="-1200.7979" clip-path="url(#clipPath2)" font-family="sans-serif" stroke="none" stroke-width="1" xml:space="preserve">fork!</text>
223 <path fill="none" d="M159 -1234 L181 -1234" stroke-width="1" clip-path="url(#clipPath2)"/>
224 <path d="M189 -1234 L177 -1239 L180 -1234 L177 -1229 Z" stroke-width="1" clip-path="url(#clipPath2)" stroke="none"/>
225 <path fill="none" d="M219 -1234 L434 -1234" stroke-width="1" clip-path="url(#clipPath2)"/>
226 <path d="M442 -1234 L430 -1239 L433 -1234 L430 -1229 Z" stroke-width="1" clip-path="url(#clipPath2)" stroke="none"/>
227 <path fill="none" d="M210 -1005.667 L292 -1005.667" stroke-width="1" clip-path="url(#clipPath2)"/>
228 <path d="M300 -1005.667 L288 -1010.667 L291 -1005.667 L288 -1000.667 Z" stroke-width="1" clip-path="url(#clipPath2)" stroke="none"/>
229 <text x="220.6406" y="-1014.1982" clip-path="url(#clipPath2)" font-family="sans-serif" stroke="none" stroke-width="1" xml:space="preserve">goes offline</text>
230 <path fill="none" d="M150 -1005.667 L172 -1005.667" stroke-width="1" clip-path="url(#clipPath2)"/>
231 <path d="M180 -1005.667 L168 -1010.667 L171 -1005.667 L168 -1000.667 Z" stroke-width="1" clip-path="url(#clipPath2)" stroke="none"/>
232 <path fill="none" d="M330 -1005.667 L434 -1005.667" stroke-width="1" clip-path="url(#clipPath2)"/>
233 <path d="M442 -1005.667 L430 -1010.667 L433 -1005.667 L430 -1000.667 Z" stroke-width="1" clip-path="url(#clipPath2)" stroke="none"/>
234 <text x="350.5889" y="-990.0654" clip-path="url(#clipPath2)" font-family="sans-serif" stroke="none" stroke-width="1" xml:space="preserve">back online,</text>
235 <text x="348.5264" y="-975.9326" clip-path="url(#clipPath2)" font-family="sans-serif" stroke="none" stroke-width="1" xml:space="preserve">syncs, learns</text>
236 <text x="362.6416" y="-961.7998" clip-path="url(#clipPath2)" font-family="sans-serif" stroke="none" stroke-width="1" xml:space="preserve">of 3 &amp; 4</text>
237 </g>
238 </g>
239 </svg>
240
--- www/branch06.svg
+++ www/branch06.svg
@@ -141,36 +141,36 @@
141 <g text-rendering="geometricPrecision" stroke-miterlimit="1.45" stroke-width="2" shape-rendering="geometricPrecision" transform="matrix(1,0,0,1,-68,1311)" stroke-linecap="butt">
142 <circle fill="none" r="15" clip-path="url(#clipPath2)" cx="375" cy="-910.834"/>
143 <text x="371.2061" y="-906.2988" clip-path="url(#clipPath2)" font-family="sans-serif" stroke="none" stroke-width="1" xml:space="preserve">6</text>
144 </g>
145 <g fill="white" text-rendering="geometricPrecision" shape-rendering="geometricPrecision" transform="matrix(1,0,0,1,-68,1311)" stroke="white">
146 <circle r="15" clip-path="url(#clipPath2)" cx="135" cy="-1234" stroke="none"/>
147 </g>
148 <g text-rendering="geometricPrecision" stroke-miterlimit="1.45" stroke-width="2" shape-rendering="geometricPrecision" transform="matrix(1,0,0,1,-68,1311)" stroke-linecap="butt">
149 <circle fill="none" r="15" clip-path="url(#clipPath2)" cx="135" cy="-1234"/>
150 <text x="131.2061" y="-1229.4648" clip-path="url(#clipPath2)" font-family="sans-serif" stroke="none" stroke-width="1" xml:space="preserve">1</text>
151 </g>
152 <g fill="silver" text-rendering="geometricPrecision" shape-rendering="geometricPrecision" transform="matrix(1,0,0,1,-68,1311)" stroke="silver">
153 <circle r="15" clip-path="url(#clipPath2)" cx="195" cy="-1191.5" stroke="none"/>
154 </g>
155 <g text-rendering="geometricPrecision" stroke-miterlimit="1.45" stroke-width="2" shape-rendering="geometricPrecision" transform="matrix(1,0,0,1,-68,1311)" stroke-linecap="butt">
156 <circle fill="none" r="15" clip-path="url(#clipPath2)" cx="195" cy="-1191.5"/>
157 <text x="191.2061" y="-1186.9648" clip-path="url(#clipPath2)" font-family="sans-serif" stroke="none" stroke-width="1" xml:space="preserve">3</text>
158 </g>
159 <g fill="white" text-rendering="geometricPrecision" shape-rendering="geometricPrecision" transform="matrix(1,0,0,1,-68,1311)" stroke="white">
160 <ellipse rx="32" ry="15" clip-path="url(#clipPath2)" cx="474" cy="-1234" stroke="none"/>
161 </g>
162 <g text-rendering="geometricPrecision" stroke-miterlimit="1.45" stroke-width="2" shape-rendering="geometricPrecision" transform="matrix(1,0,0,1,-68,1311)" stroke-linecap="butt">
163 <ellipse rx="32" fill="none" ry="15" clip-path="url(#clipPath2)" cx="474" cy="-1234"/>
164 <text x="456.3047" y="-1229.4648" clip-path="url(#clipPath2)" font-family="sans-serif" stroke="none" stroke-width="1" xml:space="preserve">future</text>
165 </g>
166 <g fill="white" text-rendering="geometricPrecision" shape-rendering="geometricPrecision" transform="matrix(1,0,0,1,-68,1311)" stroke="white">
167 <circle r="15" clip-path="url(#clipPath2)" cx="195" cy="-1234" stroke="none"/>
168 </g>
169 <g text-rendering="geometricPrecision" stroke-miterlimit="1.45" stroke-width="2" shape-rendering="geometricPrecision" transform="matrix(1,0,0,1,-68,1311)" stroke-linecap="butt">
170 <circle fill="none" r="15" clip-path="url(#clipPath2)" cx="195" cy="-1234"/>
171 <text x="191.2061" y="-1229.4648" clip-path="url(#clipPath2)" font-family="sans-serif" stroke="none" stroke-width="1" xml:space="preserve">2</text>
172 </g>
173 <g fill="white" text-rendering="geometricPrecision" shape-rendering="geometricPrecision" transform="matrix(1,0,0,1,-68,1311)" stroke="white">
174 <circle r="15" clip-path="url(#clipPath2)" cx="195" cy="-1005.667" stroke="none"/>
175 </g>
176 <g text-rendering="geometricPrecision" stroke-miterlimit="1.45" stroke-width="2" shape-rendering="geometricPrecision" transform="matrix(1,0,0,1,-68,1311)" stroke-linecap="butt">
@@ -215,25 +215,25 @@
215 <path d="M300 -910.834 L288 -915.834 L291 -910.834 L288 -905.834 Z" stroke-width="1" clip-path="url(#clipPath2)" stroke="none"/>
216 <path fill="none" d="M330 -910.834 L352 -910.834" stroke-width="1" clip-path="url(#clipPath2)"/>
217 <path d="M360 -910.834 L348 -915.834 L351 -910.834 L348 -905.834 Z" stroke-width="1" clip-path="url(#clipPath2)" stroke="none"/>
218 <path fill="none" d="M390 -910.834 L434 -910.834" stroke-width="1" clip-path="url(#clipPath2)"/>
219 <path d="M442 -910.834 L430 -915.834 L433 -910.834 L430 -905.834 Z" stroke-width="1" clip-path="url(#clipPath2)" stroke="none"/>
220 <path fill="none" d="M147.2404 -1225.3297 L176.2314 -1204.7944" stroke-width="1" clip-path="url(#clipPath2)"/>
221 <path d="M182.7596 -1200.1703 L175.8574 -1211.1866 L175.4154 -1205.3724 L170.0773 -1203.0264 Z" stroke-width="1" clip-path="url(#clipPath2)" stroke="none"/>
222 <text x="134.248" y="-1200.7979" clip-path="url(#clipPath2)" font-family="sans-serif" stroke="none" stroke-width="1" xml:space="preserve">fork!</text>
223 <path fill="none" d="M150 -1234 L172 -1234" stroke-width="1" clip-path="url(#clipPath2)"/>
224 <path d="M180 -1234 L168 -1239 L171 -1234 L168 -1229 Z" stroke-width="1" clip-path="url(#clipPath2)" stroke="none"/>
225 <path fill="none" d="M210 -1234 L434 -1234" stroke-width="1" clip-path="url(#clipPath2)"/>
226 <path d="M442 -1234 L430 -1239 L433 -1234 L430 -1229 Z" stroke-width="1" clip-path="url(#clipPath2)" stroke="none"/>
227 <path fill="none" d="M210 -1005.667 L292 -1005.667" stroke-width="1" clip-path="url(#clipPath2)"/>
228 <path d="M300 -1005.667 L288 -1010.667 L291 -1005.667 L288 -1000.667 Z" stroke-width="1" clip-path="url(#clipPath2)" stroke="none"/>
229 <text x="220.6406" y="-1014.1982" clip-path="url(#clipPath2)" font-family="sans-serif" stroke="none" stroke-width="1" xml:space="preserve">goes offline</text>
230 <path fill="none" d="M150 -1005.667 L172 -1005.667" stroke-width="1" clip-path="url(#clipPath2)"/>
231 <path d="M180 -1005.667 L168 -1010.667 L171 -1005.667 L168 -1000.667 Z" stroke-width="1" clip-path="url(#clipPath2)" stroke="none"/>
232 <path fill="none" d="M330 -1005.667 L434 -1005.667" stroke-width="1" clip-path="url(#clipPath2)"/>
233 <path d="M442 -1005.667 L430 -1010.667 L433 -1005.667 L430 -1000.667 Z" stroke-width="1" clip-path="url(#clipPath2)" stroke="none"/>
234 <text x="350.5889" y="-990.0654" clip-path="url(#clipPath2)" font-family="sans-serif" stroke="none" stroke-width="1" xml:space="preserve">back online,</text>
235 <text x="357.7256" y="-975.9326" clip-path="url(#clipPath2)" font-family="sans-serif" stroke="none" stroke-width="1" xml:space="preserve">pushes 5,</text>
236 <text x="354.5059" y="-961.7998" clip-path="url(#clipPath2)" font-family="sans-serif" stroke="none" stroke-width="1" xml:space="preserve">pulls 3 &amp; 4</text>
237 </g>
238 </g>
239 </svg>
240

Keyboard Shortcuts

Open search /
Next entry (timeline) j
Previous entry (timeline) k
Open focused entry Enter
Show this help ?
Toggle theme Top nav button