From: Simon A. Eugster Date: Sat, 12 Nov 2011 15:34:09 +0000 (+0100) Subject: Git workflow updated according (hopefully) to Alberto's comments X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=0206206a0cb943cccd2dde2a36f4072bdf22e578;p=kdenlive Git workflow updated according (hopefully) to Alberto's comments --- diff --git a/kdenlive-git-workflow.svg b/git-workflow.svg similarity index 70% rename from kdenlive-git-workflow.svg rename to git-workflow.svg index 1eab79fd..73b24658 100644 --- a/kdenlive-git-workflow.svg +++ b/git-workflow.svg @@ -11,11 +11,11 @@ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" width="1400" - height="600" + height="800" id="svg2" version="1.1" inkscape:version="0.48.1 r9760" - sodipodi:docname="kdenlive-git-workflow.svg" + sodipodi:docname="git-workflow.svg" inkscape:export-filename="/tmp/kdenlive-git-workflow.png" inkscape:export-xdpi="90" inkscape:export-ydpi="90"> @@ -49,6 +49,20 @@ transform="scale(-0.6,-0.6)" inkscape:connector-curvature="0" /> + + + + inkscape:guide-bbox="true" + inkscape:bbox-paths="true"> - - + @@ -118,21 +129,21 @@ inkscape:label="Layer 1" inkscape:groupmode="layer" id="layer1" - transform="translate(325.2691,53.926332)"> + transform="translate(325.2691,253.92633)"> + transform="translate(20.681252,9.4129353)"> + transform="translate(-181.31874,-86.712769)"> + transform="translate(15.730902,-2.5870447)"> + transform="translate(416.7309,-297.58704)"> + transform="translate(-791.14841,-65.171573)"> Keep stable + y="-40.224854">Keep stable Testing branch + y="-40.224854">Testing branch Experimental features + y="237.77515">Experimental features Bugfix branches + y="237.77515">Bugfix branches Branch tagged release Branch a tagged release for working on urgent fixes New features New features and bugfixes ready for testing Stable features + y="-28.057436">Stable features Trivial bugfixes and features Bugfixes are done here + y="14.332556" + id="tspan3242">are done here Bugfixes + y="30.632429">Updates Can be local or public + y="266.05316">Can be local or public Branch that is more or less stablewith the newest features Kdenlive’s git workflow + y="-116.26205">Kdenlive’s git workflow Originals of the clones in the drawing Tag releases when bugs fixed - Or do we work on the Master directly? + y="270.67548">Urgent bugfixes are done here Releases are tagged + y="41.56461">Releases are tagged Development goes on here only + sodipodi:role="line">Normal development goes on here only + For new features and non-trivial bugfixes + (No need to create a new branchif no urgent bugfixes) + + Bugfixes + + Changes affecting development + Notes + When a new feature is implemented, its branch is first merged to Next. When the feature is regarded as stable,the feature branch is merged directly into Master.