--- /dev/null
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/"
+ xmlns:cc="http://creativecommons.org/ns#"
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns:svg="http://www.w3.org/2000/svg"
+ xmlns="http://www.w3.org/2000/svg"
+ xmlns:xlink="http://www.w3.org/1999/xlink"
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+ width="1400"
+ height="600"
+ id="svg2"
+ version="1.1"
+ inkscape:version="0.48.1 r9760"
+ sodipodi:docname="kdenlive-git-workflow.svg"
+ inkscape:export-filename="/tmp/kdenlive-git-workflow.png"
+ inkscape:export-xdpi="90"
+ inkscape:export-ydpi="90">
+ <defs
+ id="defs4">
+ <marker
+ inkscape:stockid="Arrow2Lend"
+ orient="auto"
+ refY="0"
+ refX="0"
+ id="Arrow2Lend"
+ style="overflow:visible">
+ <path
+ id="path3935"
+ style="font-size:12px;fill-rule:evenodd;stroke-width:0.625;stroke-linejoin:round"
+ d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"
+ transform="matrix(-1.1,0,0,-1.1,-1.1,0)"
+ inkscape:connector-curvature="0" />
+ </marker>
+ <marker
+ inkscape:stockid="Arrow2Mend"
+ orient="auto"
+ refY="0"
+ refX="0"
+ id="Arrow2Mend"
+ style="overflow:visible">
+ <path
+ id="path3941"
+ style="font-size:12px;fill-rule:evenodd;stroke-width:0.625;stroke-linejoin:round"
+ d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"
+ transform="scale(-0.6,-0.6)"
+ inkscape:connector-curvature="0" />
+ </marker>
+ </defs>
+ <sodipodi:namedview
+ id="base"
+ pagecolor="#ffffff"
+ bordercolor="#666666"
+ borderopacity="1.0"
+ inkscape:pageopacity="1"
+ inkscape:pageshadow="2"
+ inkscape:zoom="0.70710678"
+ inkscape:cx="829.75639"
+ inkscape:cy="303.8936"
+ inkscape:document-units="px"
+ inkscape:current-layer="layer1"
+ showgrid="false"
+ inkscape:window-width="1366"
+ inkscape:window-height="709"
+ inkscape:window-x="-3"
+ inkscape:window-y="-3"
+ inkscape:window-maximized="1"
+ inkscape:snap-bbox="false"
+ inkscape:bbox-nodes="false"
+ inkscape:snap-global="false"
+ fit-margin-top="0"
+ fit-margin-left="0"
+ fit-margin-right="0"
+ fit-margin-bottom="0"
+ showguides="false"
+ inkscape:guide-bbox="true">
+ <sodipodi:guide
+ orientation="1,0"
+ position="350.72496,666.09459"
+ id="guide5235" />
+ <sodipodi:guide
+ orientation="1,0"
+ position="412.95036,332.34019"
+ id="guide5237" />
+ <sodipodi:guide
+ orientation="1,0"
+ position="779,274"
+ id="guide5239" />
+ <sodipodi:guide
+ orientation="0,1"
+ position="412.95036,455"
+ id="guide5241" />
+ <sodipodi:guide
+ orientation="0,1"
+ position="412.95036,177"
+ id="guide5243" />
+ <sodipodi:guide
+ orientation="1,0"
+ position="1004,542"
+ id="guide5245" />
+ </sodipodi:namedview>
+ <metadata
+ id="metadata7">
+ <rdf:RDF>
+ <cc:Work
+ rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+ <dc:title />
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <g
+ inkscape:label="Layer 1"
+ inkscape:groupmode="layer"
+ id="layer1"
+ transform="translate(325.2691,53.926332)">
+ <rect
+ style="color:#000000;fill:#6c87d6;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ id="rect2985"
+ width="162"
+ height="72"
+ x="-77"
+ y="-244.63782" />
+ <g
+ id="g3850"
+ transform="translate(20.681252,140.71149)">
+ <use
+ height="1052.3622"
+ width="744.09448"
+ transform="translate(-66.29855,470.75735)"
+ id="use3816"
+ xlink:href="#g3811"
+ y="0"
+ x="0" />
+ <text
+ sodipodi:linespacing="125%"
+ id="text2991"
+ y="278.65509"
+ x="94"
+ style="font-size:30px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#ffffff;fill-opacity:1;stroke:none;font-family:Sans;-inkscape-font-specification:Sans"
+ xml:space="preserve"><tspan
+ y="278.65509"
+ x="94"
+ id="tspan2993"
+ sodipodi:role="line">Release</tspan></text>
+ </g>
+ <g
+ id="g3791"
+ transform="translate(-181.31874,44.585786)">
+ <use
+ x="0"
+ y="0"
+ xlink:href="#rect2985"
+ id="use2995"
+ transform="translate(346,292)"
+ width="744.09448"
+ height="1052.3622" />
+ <text
+ sodipodi:linespacing="125%"
+ id="text2997"
+ y="99.362183"
+ x="296"
+ style="font-size:30px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#ffffff;fill-opacity:1;stroke:none;font-family:Sans;-inkscape-font-specification:Sans"
+ xml:space="preserve"><tspan
+ y="99.362183"
+ x="296"
+ id="tspan2999"
+ sodipodi:role="line">Master</tspan></text>
+ </g>
+ <g
+ id="g3845"
+ transform="translate(15.730902,128.71151)">
+ <use
+ height="1052.3622"
+ width="744.09448"
+ transform="translate(304.70144,482.75736)"
+ id="use3843"
+ xlink:href="#g3811"
+ y="0"
+ x="0" />
+ <text
+ sodipodi:linespacing="125%"
+ id="text3005"
+ y="289.24088"
+ x="461"
+ style="font-size:30px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#ffffff;fill-opacity:1;stroke:none;font-family:Sans;-inkscape-font-specification:Sans"
+ xml:space="preserve"><tspan
+ y="289.24088"
+ x="461"
+ id="tspan3007"
+ sodipodi:role="line">Feature</tspan></text>
+ </g>
+ <g
+ id="g3781"
+ transform="translate(416.7309,-166.28849)">
+ <use
+ height="1052.3622"
+ width="744.09448"
+ transform="translate(114,502)"
+ id="use3001"
+ xlink:href="#rect2985"
+ y="0"
+ x="0" />
+ <text
+ sodipodi:linespacing="125%"
+ id="text3009"
+ y="309.36218"
+ x="77"
+ style="font-size:30px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#ffffff;fill-opacity:1;stroke:none;font-family:Sans;-inkscape-font-specification:Sans"
+ xml:space="preserve"><tspan
+ y="309.36218"
+ x="77"
+ id="tspan3011"
+ sodipodi:role="line">Next</tspan></text>
+ </g>
+ <g
+ id="g3811"
+ transform="translate(-78.384776,-65.171573)">
+ <rect
+ style="color:#000000;fill:#ebeef8;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ id="rect3805"
+ width="162"
+ height="72"
+ x="236.68333"
+ y="-162.2236" />
+ <rect
+ y="-170.2236"
+ x="224.68333"
+ height="72"
+ width="162"
+ id="rect3807"
+ style="color:#000000;fill:#b5c2e6;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+ <rect
+ style="color:#000000;fill:#6c87d6;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ id="rect3809"
+ width="162"
+ height="72"
+ x="211.68333"
+ y="-177.2236" />
+ </g>
+ <text
+ xml:space="preserve"
+ style="font-size:24px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:end;text-decoration:none;line-height:125%;letter-spacing:0px;word-spacing:0px;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:end;baseline-shift:baseline;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
+ x="25.45586"
+ y="91.0737"
+ id="text3874"
+ sodipodi:linespacing="125%"><tspan
+ sodipodi:role="line"
+ id="tspan3876"
+ x="25.45586"
+ y="91.0737">Keep stable</tspan></text>
+ <text
+ xml:space="preserve"
+ style="font-size:24px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:125%;letter-spacing:0px;word-spacing:0px;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
+ x="678.7309"
+ y="91.0737"
+ id="text3878"
+ sodipodi:linespacing="125%"><tspan
+ sodipodi:role="line"
+ id="tspan3880"
+ x="678.7309"
+ y="91.0737">Testing branch</tspan></text>
+ <text
+ xml:space="preserve"
+ style="font-size:24px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:125%;letter-spacing:0px;word-spacing:0px;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
+ x="678.7309"
+ y="369.0737"
+ id="text3882"
+ sodipodi:linespacing="125%"><tspan
+ sodipodi:role="line"
+ id="tspan3884"
+ x="678.7309"
+ y="369.0737">Experimental features</tspan></text>
+ <text
+ xml:space="preserve"
+ style="font-size:24px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:end;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:end;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans;-inkscape-font-specification:Sans"
+ x="25.45586"
+ y="369.0737"
+ id="text3886"
+ sodipodi:linespacing="125%"><tspan
+ sodipodi:role="line"
+ id="tspan3888"
+ x="25.45586"
+ y="369.0737">Bugfix branches</tspan></text>
+ <path
+ style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-end:url(#Arrow2Lend)"
+ d="m 160.13708,196.3782 0,141.42136"
+ id="path3909"
+ inkscape:connector-curvature="0" />
+ <text
+ xml:space="preserve"
+ style="font-size:16px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:end;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:end;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans;-inkscape-font-specification:Sans"
+ x="69.348198"
+ y="256.41983"
+ id="text4541"
+ sodipodi:linespacing="125%"><tspan
+ sodipodi:role="line"
+ id="tspan4543"
+ x="74.441948"
+ y="256.41983">Branch tagged release </tspan><tspan
+ sodipodi:role="line"
+ x="69.348198"
+ y="276.41983"
+ id="tspan5179">for working on urgent fixes</tspan></text>
+ <path
+ style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-end:url(#Arrow2Lend)"
+ d="m 539.28845,349.11326 0,-154.14928"
+ id="path4545"
+ inkscape:connector-curvature="0" />
+ <text
+ xml:space="preserve"
+ style="font-size:16px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:125%;letter-spacing:0px;word-spacing:0px;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
+ x="573.33008"
+ y="262.04724"
+ id="text4731"
+ sodipodi:linespacing="125%"><tspan
+ sodipodi:role="line"
+ id="tspan4733"
+ x="573.33008"
+ y="262.04724">New features </tspan><tspan
+ sodipodi:role="line"
+ x="573.33008"
+ y="282.04724"
+ id="tspan5229">ready for testing</tspan></text>
+ <path
+ style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+ d="M 428.12193,128.69696 z"
+ id="path4773"
+ inkscape:connector-curvature="0" />
+ <path
+ style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-end:url(#Arrow2Lend)"
+ d="m 426.70772,116.67614 -154.14928,0"
+ id="path4775"
+ inkscape:connector-curvature="0" />
+ <text
+ xml:space="preserve"
+ style="font-size:16px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans;-inkscape-font-specification:Sans"
+ x="289.52899"
+ y="103.24112"
+ id="text4961"
+ sodipodi:linespacing="125%"><tspan
+ sodipodi:role="line"
+ id="tspan4963"
+ x="289.52899"
+ y="103.24112">Stable features</tspan></text>
+ <text
+ xml:space="preserve"
+ style="font-size:16px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:end;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:end;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans;-inkscape-font-specification:Sans"
+ x="25.45586"
+ y="125.63111"
+ id="text4965"
+ sodipodi:linespacing="125%"><tspan
+ sodipodi:role="line"
+ id="tspan4967"
+ x="25.45586"
+ y="125.63111">Bugfixes are done here</tspan></text>
+ <text
+ xml:space="preserve"
+ style="font-size:16px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans;-inkscape-font-specification:Sans"
+ x="314.27774"
+ y="161.93098"
+ id="text5155"
+ sodipodi:linespacing="125%"><tspan
+ sodipodi:role="line"
+ id="tspan5157"
+ x="314.27774"
+ y="161.93098">Bugfixes </tspan></text>
+ <text
+ xml:space="preserve"
+ style="font-size:16px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans;-inkscape-font-specification:Sans"
+ x="678.7309"
+ y="397.35172"
+ id="text5159"
+ sodipodi:linespacing="125%"><tspan
+ sodipodi:role="line"
+ id="tspan5161"
+ x="678.7309"
+ y="397.35172">Can be local or public</tspan></text>
+ <text
+ xml:space="preserve"
+ style="font-size:16px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans;-inkscape-font-specification:Sans"
+ x="678.7309"
+ y="121.98122"
+ id="text5163"
+ sodipodi:linespacing="125%"><tspan
+ sodipodi:role="line"
+ x="678.7309"
+ y="121.98122"
+ id="tspan5167">Branch that is more or less stable</tspan><tspan
+ sodipodi:role="line"
+ x="678.7309"
+ y="141.98122"
+ id="tspan5259">with the newest features</tspan></text>
+ <text
+ xml:space="preserve"
+ style="font-size:36px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#484848;fill-opacity:1;stroke:none;font-family:Sans;-inkscape-font-specification:Sans"
+ x="-280.72137"
+ y="15.036505"
+ id="text5171"
+ sodipodi:linespacing="125%"><tspan
+ sodipodi:role="line"
+ id="tspan5173"
+ x="-280.72137"
+ y="15.036505">Kdenlive’s git workflow</tspan></text>
+ <text
+ xml:space="preserve"
+ style="font-size:16px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans;-inkscape-font-specification:Sans"
+ x="-37.2691"
+ y="-269.9263"
+ id="text5175"
+ sodipodi:linespacing="125%"><tspan
+ sodipodi:role="line"
+ id="tspan5177"
+ x="-37.2691"
+ y="-269.9263">Originals of the clones in the drawing</tspan></text>
+ <text
+ xml:space="preserve"
+ style="font-size:16px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:end;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:end;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans;-inkscape-font-specification:Sans"
+ x="25.45586"
+ y="401.97403"
+ id="text5181"
+ sodipodi:linespacing="125%"><tspan
+ sodipodi:role="line"
+ id="tspan5183"
+ x="25.45586"
+ y="401.97403">Tag releases when bugs fixed</tspan></text>
+ <text
+ xml:space="preserve"
+ style="font-size:16px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:end;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:end;color:#000000;fill:#d69f6c;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
+ x="25.45586"
+ y="428.1456"
+ id="text5185"
+ sodipodi:linespacing="125%"><tspan
+ sodipodi:role="line"
+ id="tspan5187"
+ x="25.45586"
+ y="428.1456">Or do we work on the Master directly?</tspan></text>
+ <text
+ xml:space="preserve"
+ style="font-size:16px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:end;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:end;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans;-inkscape-font-specification:Sans"
+ x="25.45586"
+ y="147.85648"
+ id="text5231"
+ sodipodi:linespacing="125%"><tspan
+ sodipodi:role="line"
+ id="tspan5233"
+ x="25.45586"
+ y="147.85648">Releases are tagged</tspan></text>
+ <path
+ inkscape:connector-curvature="0"
+ id="path5247"
+ d="m 271.73042,137.18224 154.14928,0"
+ style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-end:url(#Arrow2Lend)" />
+ <text
+ sodipodi:linespacing="125%"
+ id="text5249"
+ y="425.98123"
+ x="678.7309"
+ style="font-size:16px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans;-inkscape-font-specification:Sans"
+ xml:space="preserve"><tspan
+ id="tspan5253"
+ y="425.98123"
+ x="678.7309"
+ sodipodi:role="line">Development goes on here only</tspan></text>
+ </g>
+</svg>
projects / kdenlive / commitdiff
