You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by ma...@apache.org on 2013/07/08 22:47:24 UTC
svn commit: r1500938 - in /cordova/site/public/wiki-images:
contributor-git.graphml contributor-git.png
Author: marcelk
Date: Mon Jul 8 20:47:23 2013
New Revision: 1500938
URL: http://svn.apache.org/r1500938
Log:
clean up lines in data flow: add 'merge', pull from github apache to local.
Modified:
cordova/site/public/wiki-images/contributor-git.graphml
cordova/site/public/wiki-images/contributor-git.png
Modified: cordova/site/public/wiki-images/contributor-git.graphml
URL: http://svn.apache.org/viewvc/cordova/site/public/wiki-images/contributor-git.graphml?rev=1500938&r1=1500937&r2=1500938&view=diff
==============================================================================
--- cordova/site/public/wiki-images/contributor-git.graphml (original)
+++ cordova/site/public/wiki-images/contributor-git.graphml Mon Jul 8 20:47:23 2013
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<graphml xmlns="http://graphml.graphdrawing.org/xmlns" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:y="http://www.yworks.com/xml/graphml" xmlns:yed="http://www.yworks.com/xml/yed/3" xsi:schemaLocation="http://graphml.graphdrawing.org/xmlns http://www.yworks.com/xml/schema/graphml/1.1/ygraphml.xsd">
- <!--Created by yFiles for Java 2.10-->
+ <!--Created by yFiles for Java 2.11-->
<key for="graphml" id="d0" yfiles.type="resources"/>
<key for="port" id="d1" yfiles.type="portgraphics"/>
<key for="port" id="d2" yfiles.type="portgeometry"/>
@@ -20,7 +20,7 @@
<y:Geometry height="46.887996673583984" width="39.527000427246094" x="64.23649978637695" y="326.556001663208"/>
<y:Fill color="#CCCCFF" transparent="false"/>
<y:BorderStyle color="#000000" type="line" width="1.0"/>
- <y:NodeLabel alignment="center" autoSizePolicy="content" fontFamily="Dialog" fontSize="12" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" height="32.265625" modelName="custom" textColor="#000000" visible="true" width="128.6171875" x="-44.54509353637695" y="50.887996673583984">Local cordova-x repo
+ <y:NodeLabel alignment="center" autoSizePolicy="content" fontFamily="Dialog" fontSize="12" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" height="32.265625" modelName="custom" textColor="#3366FF" visible="true" width="128.6171875" x="-44.54509353637695" y="50.887996673583984">Local cordova-x repo
(your workstation)<y:LabelModel>
<y:SmartNodeLabelModel distance="4.0"/>
</y:LabelModel>
@@ -41,7 +41,7 @@
<y:Geometry height="46.887996673583984" width="39.527000427246094" x="305.23649978637695" y="326.556001663208"/>
<y:Fill color="#CCCCFF" transparent="false"/>
<y:BorderStyle color="#000000" type="line" width="1.0"/>
- <y:NodeLabel alignment="center" autoSizePolicy="content" fontFamily="Dialog" fontSize="12" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" height="32.265625" modelName="custom" textColor="#000000" visible="true" width="183.806640625" x="-72.13982009887695" y="50.887996673583984">github.com/you/cordova-x.git
+ <y:NodeLabel alignment="center" autoSizePolicy="content" fontFamily="Dialog" fontSize="12" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" height="32.265625" modelName="custom" textColor="#3366FF" visible="true" width="183.806640625" x="-72.13982009887695" y="50.887996673583984">github.com/you/cordova-x.git
(origin)<y:LabelModel>
<y:SmartNodeLabelModel distance="4.0"/>
</y:LabelModel>
@@ -62,7 +62,7 @@
<y:Geometry height="46.887996673583984" width="39.527000427246094" x="555.236499786377" y="326.556001663208"/>
<y:Fill color="#CCCCFF" transparent="false"/>
<y:BorderStyle color="#000000" type="line" width="1.0"/>
- <y:NodeLabel alignment="center" autoSizePolicy="content" fontFamily="Dialog" fontSize="12" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" height="32.265625" modelName="custom" textColor="#000000" visible="true" width="203.8046875" x="-82.13884353637695" y="50.887996673583984">github.com/apache/cordova-x.git
+ <y:NodeLabel alignment="center" autoSizePolicy="content" fontFamily="Dialog" fontSize="12" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" height="32.265625" modelName="custom" textColor="#3366FF" visible="true" width="203.8046875" x="-82.13884353637695" y="50.887996673583984">github.com/apache/cordova-x.git
(upstream)<y:LabelModel>
<y:SmartNodeLabelModel distance="4.0"/>
</y:LabelModel>
@@ -83,7 +83,7 @@
<y:Geometry height="46.887996673583984" width="39.527000427246094" x="555.236499786377" y="126.55600166320801"/>
<y:Fill color="#CCCCFF" transparent="false"/>
<y:BorderStyle color="#000000" type="line" width="1.0"/>
- <y:NodeLabel alignment="center" autoSizePolicy="content" fontFamily="Dialog" fontSize="12" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" height="32.265625" modelName="custom" textColor="#000000" visible="true" width="284.001953125" x="-122.23747634887695" y="-41.68881416320801">git-wip-us.apache.org/repos/asf/cordova-x.git
+ <y:NodeLabel alignment="center" autoSizePolicy="content" fontFamily="Dialog" fontSize="12" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" height="32.265625" modelName="custom" textColor="#3366FF" visible="true" width="284.001953125" x="-122.23747634887695" y="-41.68881416320801">git-wip-us.apache.org/repos/asf/cordova-x.git
(apache)<y:LabelModel>
<y:SmartNodeLabelModel distance="4.0"/>
</y:LabelModel>
@@ -171,12 +171,12 @@
<edge id="e4" source="n3" target="n0">
<data key="d10">
<y:ArcEdge>
- <y:Path sx="0.0" sy="0.0" tx="0.0" ty="0.0">
- <y:Point x="286.2912902832031" y="143.92259216308594"/>
+ <y:Path sx="0.0" sy="0.0" tx="-8.5" ty="-13.0">
+ <y:Point x="284.849853515625" y="135.58621215820312"/>
</y:Path>
<y:LineStyle color="#000000" type="line" width="1.0"/>
<y:Arrows source="none" target="standard"/>
- <y:EdgeLabel alignment="center" configuration="AutoFlippingLabel" distance="2.0" fontFamily="Dialog" fontSize="12" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" height="18.1328125" modelName="custom" preferredPlacement="anywhere" ratio="0.5" textColor="#000000" visible="true" width="25.9375" x="-243.66814033317212" y="-8.362292445822732">pull<y:LabelModel>
+ <y:EdgeLabel alignment="center" configuration="AutoFlippingLabel" distance="2.0" fontFamily="Dialog" fontSize="12" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" height="18.1328125" modelName="custom" preferredPlacement="anywhere" ratio="0.5" textColor="#000000" visible="true" width="25.9375" x="-244.87165865518426" y="-14.964551115565058">pull<y:LabelModel>
<y:SmartEdgeLabelModel autoRotationEnabled="false" defaultAngle="0.0" defaultDistance="10.0"/>
</y:LabelModel>
<y:ModelParameter>
@@ -184,21 +184,21 @@
</y:ModelParameter>
<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>
- <y:Arc height="-114.53998565673828" ratio="-0.8641744256019592" type="fixedRatio"/>
+ <y:Arc height="-115.22827911376953" ratio="-0.8641744256019592" type="fixedRatio"/>
</y:ArcEdge>
</data>
</edge>
- <edge id="e5" source="n2" target="n1">
+ <edge id="e5" source="n3" target="n2">
<data key="d10">
<y:PolyLineEdge>
<y:Path sx="0.0" sy="0.0" tx="0.0" ty="0.0"/>
<y:LineStyle color="#000000" type="line" width="1.0"/>
<y:Arrows source="none" target="standard"/>
- <y:EdgeLabel alignment="center" configuration="AutoFlippingLabel" distance="2.0" fontFamily="Dialog" fontSize="12" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" height="18.1328125" modelName="custom" preferredPlacement="anywhere" ratio="0.5" textColor="#000000" visible="true" width="25.9375" x="-118.223876953125" y="-28.1328125">pull<y:LabelModel>
+ <y:EdgeLabel alignment="center" configuration="AutoFlippingLabel" distance="2.0" fontFamily="Dialog" fontSize="12" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" height="18.1328125" modelName="custom" preferredPlacement="anywhere" ratio="0.5" textColor="#000000" visible="true" width="87.6015625" x="20.19921875" y="53.447265625">automatic pull<y:LabelModel>
<y:SmartEdgeLabelModel autoRotationEnabled="false" defaultAngle="0.0" defaultDistance="10.0"/>
</y:LabelModel>
<y:ModelParameter>
- <y:SmartEdgeLabelModelParameter angle="6.283185307179586" distance="10.0" distanceToCenter="false" position="right" ratio="0.5" segment="0"/>
+ <y:SmartEdgeLabelModelParameter angle="6.283185307179586" distance="64.0" distanceToCenter="true" position="left" ratio="0.38798135187605237" segment="-1"/>
</y:ModelParameter>
<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>
@@ -206,23 +206,47 @@
</y:PolyLineEdge>
</data>
</edge>
- <edge id="e6" source="n3" target="n2">
+ <edge id="e6" source="n1" target="n3">
<data key="d9"/>
<data key="d10">
- <y:PolyLineEdge>
- <y:Path sx="0.0" sy="0.0" tx="0.0" ty="0.0"/>
+ <y:ArcEdge>
+ <y:Path sx="0.0" sy="0.0" tx="0.0" ty="0.0">
+ <y:Point x="400.0" y="187.5"/>
+ </y:Path>
<y:LineStyle color="#000000" type="line" width="1.0"/>
<y:Arrows source="none" target="standard"/>
- <y:EdgeLabel alignment="center" configuration="AutoFlippingLabel" distance="2.0" fontFamily="Dialog" fontSize="12" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" height="18.1328125" modelName="custom" preferredPlacement="anywhere" ratio="0.5" textColor="#000000" visible="true" width="87.6015625" x="21.19921875" y="68.447265625">automatic pull<y:LabelModel>
+ <y:EdgeLabel alignment="center" configuration="AutoFlippingLabel" distance="2.0" fontFamily="Dialog" fontSize="12" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" height="18.1328125" modelName="custom" preferredPlacement="anywhere" ratio="0.5" textColor="#000000" visible="true" width="40.966796875" x="97.03904268931029" y="-157.93853117268145">merge<y:LabelModel>
<y:SmartEdgeLabelModel autoRotationEnabled="false" defaultAngle="0.0" defaultDistance="10.0"/>
</y:LabelModel>
<y:ModelParameter>
- <y:SmartEdgeLabelModelParameter angle="6.283185307179586" distance="65.0" distanceToCenter="true" position="left" ratio="0.5080013320088534" segment="-1"/>
+ <y:SmartEdgeLabelModelParameter angle="0.0" distance="30.0" distanceToCenter="true" position="center" ratio="0.3537368103709351" segment="-1"/>
</y:ModelParameter>
<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>
- <y:BendStyle smoothed="false"/>
- </y:PolyLineEdge>
+ <y:Arc height="80.03905487060547" ratio="1.0" type="fixedRatio"/>
+ </y:ArcEdge>
+ </data>
+ </edge>
+ <edge id="e7" source="n2" target="n0">
+ <data key="d9"/>
+ <data key="d10">
+ <y:BezierEdge>
+ <y:Path sx="0.0" sy="0.0" tx="0.0" ty="0.0">
+ <y:Point x="420.5" y="323.0"/>
+ <y:Point x="407.5" y="509.0"/>
+ <y:Point x="221.5" y="408.0"/>
+ </y:Path>
+ <y:LineStyle color="#000000" type="line" width="1.0"/>
+ <y:Arrows source="none" target="standard"/>
+ <y:EdgeLabel alignment="center" configuration="AutoFlippingLabel" distance="2.0" fontFamily="Dialog" fontSize="12" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" height="18.1328125" modelName="custom" preferredPlacement="anywhere" ratio="0.5" textColor="#000000" visible="true" width="25.9375" x="-156.3099314674016" y="88.76307838846071">pull<y:LabelModel>
+ <y:SmartEdgeLabelModel autoRotationEnabled="false" defaultAngle="0.0" defaultDistance="10.0"/>
+ </y:LabelModel>
+ <y:ModelParameter>
+ <y:SmartEdgeLabelModelParameter angle="6.283185307179586" distance="30.0" distanceToCenter="false" position="center" ratio="0.6607427375765698" segment="1"/>
+ </y:ModelParameter>
+ <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>
+ </y:BezierEdge>
</data>
</edge>
</graph>
Modified: cordova/site/public/wiki-images/contributor-git.png
URL: http://svn.apache.org/viewvc/cordova/site/public/wiki-images/contributor-git.png?rev=1500938&r1=1500937&r2=1500938&view=diff
==============================================================================
Binary files - no diff available.
Fwd: svn commit: r1500938 - in /cordova/site/public/wiki-images: contributor-git.graphml contributor-git.png
Posted by Marcel Kinard <cm...@gmail.com>.
FYI, I tweaked the png diagram of the repo flow on https://wiki.apache.org/cordova/ContributorWorkflow to closer match reality. Let me know if I capture anything incorrectly.
Begin forwarded message:
> From: marcelk@apache.org
> Subject: svn commit: r1500938 - in /cordova/site/public/wiki-images: contributor-git.graphml contributor-git.png
> Date: July 8, 2013 4:47:24 PM EDT
> To: commits@cordova.apache.org
> Reply-To: dev@cordova.apache.org
>
> Author: marcelk
> Date: Mon Jul 8 20:47:23 2013
> New Revision: 1500938
>
> URL: http://svn.apache.org/r1500938
> Log:
> clean up lines in data flow: add 'merge', pull from github apache to local.
>
> Modified:
> cordova/site/public/wiki-images/contributor-git.graphml
> cordova/site/public/wiki-images/contributor-git.png