Commits

Arne Babenhauserheide committed f86dae2

polish

  • Participants
  • Parent commits 5d46253
  • Branches subversion

Comments (0)

Files changed (1)

 - diskspace
 - collaborating
 
-** General Workflow and Cost
+** Workflow: Backup Folders
 
 ***                                                                   :BMCOL:
     :PROPERTIES:
     :BEAMER_col: 0.45
     :END:
 
-#+BEGIN_SRC ditaa :file hg-init-workflow.png 
-   +--- arne --------------------------------------------+
-   |                 +-----------------\ +-------------+ |
-   |                 | sci 9 v0.2 cBLU | | =Changelog= | |
-   |                 |                 *-*             | |
-   |                 \-----------------+ | v0.2        | |
-   |                                     | - proj      | |  
-   |                                     | - feat      | |  
-   |                 +--------------\    |          {d}| |  +--- drak -------+
-   |           /---->| sci 8 feat   |    +-------------+ |  | +------------\ |
-   |           |     \--------------+         /---=-----------| sci 6 hack | |
-   |           |                              |          |  | \------------+ |
-   |           |     +--------------\         |          |  |                |
-   |           :     | sci 7 joined |<--------/          |  | +------------\ |
-   |           |     \--------------+ /----------=----------->| sci 5 proj | |
-   |           |                      |                  |  | \------------+ |
-   | +-------------\ +-----------------\ +-------------+ |  +----------------+
-   | | sci 3 works | | sci 4 v0.1 cBLU | | =Changelog= | |
-   | \-------------+ |                 *-*             | |
-   |                 \-----------------+ | v0.1        | |
-   | +-------------\                     | - science   | |
-   | | sci 2 plan  | +--------------\    |          {d}| |
-   | \-------------+ | sci 1 works  |    +-------------+ |
-   |                 \--------------+                    |
-   |                                                     |
-   |                 +--------------\                    |
-   |                 | sci 0 init   |                    |
-   |                 \--------------+                    |
-   |                                                     |
-   +-----------------------------------------------------+
+#+BEGIN_SRC ditaa :file hg-init-workflow-folders.png 
+  +--- arne --------------------------------------------+
+  |                 +-----------------\ +-------------+ |
+  |                 | sci 9 v0.2 cBLU | | =Changelog= | |
+  |                 |                 *-*             | |      Workflow
+  |                 \-----------------+ | v0.2        | |
+  |                                     | - proj      | |  
+  |                                     | - feat      | |  
+  |                 +--------------\    |          {d}| |  +--- drak -------+
+  |           /---->| sci 8 feat   |    +-------------+ |  | +------------\ |
+  |           |     \--------------+         /---=-----------| sci 6 hack | |
+  |           |                              |          |  | \------------+ |
+  |           |                              |          |  |                |
+  |           |     +--------------\         |          |  |                |
+  |           :     | sci 7 joined |<--------/          |  | +------------\ |
+  |           |     \--------------+ /----------=----------->| sci 5 proj | |
+  |           |                      |                  |  | \------------+ |
+  |           |                      |                  |  |                |
+  | +-------------\ +-----------------\ +-------------+ |  +----------------+
+  | | sci 3 works | | sci 4 v0.1 cBLU | | =Changelog= | |                  
+  | \-------------+ |                 *-*             | |                  
+  |                 \-----------------+ | v0.1        | |      Glossary      
+  |                                     | - science   | |   +--------------\
+  | +-------------\                     |         {d} | |   | release cBLU |
+  | | sci 2 plan  | +--------------\    +-------------+ |   \--------------+
+  | \-------------+ | sci 1 works  |                    |   +--------------\
+  |                 \--------------+                    |   | commit       |
+  |                                                     |   \--------------+
+  |                                                     |  
+  |                 +--------------\                    |   
+  |                 | sci 0 init   |                    |
+  |                 \--------------+                    |
+  |                                                     |
+  +-----------------------------------------------------+
+#+END_SRC
+
+*** Cost: Backup folders                                              :BMCOL:
+    :PROPERTIES:
+    :BEAMER_col: 0.45
+    :END:
+#+BEGIN_SRC ditaa :file hg-init-workflow-folders-cost.png 
+  +--- arne --------------------------------------------+
+  |                 +-----------------\ +-------------+ |
+  |                 | sci 9 v0.2 cGRE | | =Changelog= | |
+  |                 |                 *-*             | |        Cost
+  |                 \-----------------+ | v0.2        | |
+  |                                     | - proj      | |  
+  |                                     | - feat      | |  
+  |                 +--------------\    |  cYEL    {d}| |  +--- drak -------+
+  |           /---->| sci 8 cRED   |    +-------------+ |  | +------------\ |
+  |           |     \--------------+         /---=-----------| sci 6 cYEL | |
+  |           |                              |          |  | \------------+ |
+  |           |                              |          |  |                |
+  |           |     +--------------\         |          |  |                |
+  |           :     | sci 7 cRED   |<--------/          |  | +------------\ |
+  |           |     \--------------+ /----------=----------->| sci 5 cGRE | |
+  |           |                      |                  |  | \------------+ |
+  |           |                      |                  |  |                |
+  | +-------------\ +-----------------\ +-------------+ |  +----------------+
+  | | sci 3 cYEL  | | sci 4 v0.1 cGRE | | =Changelog= | |                  
+  | \-------------+ |                 *-*             | |                  
+  |                 \-----------------+ | v0.1        | |      Glossary       
+  |                                     | - science   | |   +---------------\
+  | +-------------\                     |  cYEL   {d} | |   | easy cGRE     |
+  | | sci 2 cYEL  | +--------------\    +-------------+ |   \---------------+
+  | \-------------+ | sci 1 cYEL   |                    |   +---------------\
+  |                 \--------------+                    |   | slow/big cYEL |
+  |                                                     |   \---------------+
+  |                                                     |   +---------------\
+  |                 +--------------\                    |   | painful  cRED |
+  |                 | sci 0 cGRE   |                    |   \---------------+
+  |                 \--------------+                    |  
+  |                                                     |
+  +-----------------------------------------------------+
+#+END_SRC
+
+
+** Workflow: Subversion
+
+***                                                                   :BMCOL:
+    :PROPERTIES:
+    :BEAMER_col: 0.45
+    :END:
+
+#+BEGIN_SRC ditaa :file hg-init-workflow-svn.png 
+  +--- arne --------------------------------------------+
+  |                 +-----------------\ +-------------+ |
+  |                 | sci 9 v0.2 cBLU | | =Changelog= | |
+  |                 |                 *-*             | |      Workflow
+  |                 \-----------------+ | v0.2        | |
+  |                        ^            | - proj      | |  
+  |                        |            | - feat      | |  
+  |                 +------+-------\    |          {d}| |  +--- drak -------+
+  |           /---->| sci 8 feat   |    +-------------+ |  | +------------\ |
+  |           |     \--------------+         /---=-----------| sci 6 hack | |
+  |           |            ^                 |  merge   |  | \------------+ |
+  |     merge |            |                 |          |  |                |
+  |           |     +------+-------\         |          |  |                |
+  |           :     | sci 7 joined |<--------/          |  | +------------\ |
+  |           |     \--------------+ /----------=----------->| sci 5 proj | |
+  |           |            ^         |      branch      |  | \------------+ |
+  |           |            |         |                  |  |                |
+  | +-------------\ +------+----------\ +-------------+ |  +----------------+
+  | | sci 3 works | | sci 4 v0.1 cBLU | | =Changelog= | |                  
+  | \-------------+ |                 *-*             | |                  
+  |          ^      \-----------------+ | v0.1        | |      Glossary      
+  |          |             ^            | - science   | |   +--------------\
+  | +--------+----\        |            |         {d} | |   | release cBLU |
+  | | sci 2 plan  | +------+-------\    +-------------+ |   \--------------+
+  | \-------------+ | sci 1 works  |                    |   +--------------\
+  |          ^      \-+------------+                    |   | commit       |
+  |          | branch |    ^                            |   \--------------+
+  |          \----=---/    |                            |       automatic
+  |                 +------+-------\                    |    ------------->
+  |                 | sci 0 init   |                    |        manual     
+  |                 \--------------+                    |    ------=------> 
+  |                                                     |  
+  +-----------------------------------------------------+
 #+END_SRC
 
 #+RESULTS:
-[[file:hg-init-workflow.png]]
+[[file:hg-init-workflow-svn.png]]
+
+*** Cost: Subversion                                                  :BMCOL:
+    :PROPERTIES:
+    :BEAMER_col: 0.45
+    :END:
+#+BEGIN_SRC ditaa :file hg-init-workflow-svn-cost.png
+  +--- arne --------------------------------------------+
+  |                 +-----------------\ +-------------+ |
+  |                 | sci 9 v0.2 cGRE | | =Changelog= | |
+  |                 |                 *-*             | |      Workflow
+  |                 \-----------------+ | v0.2        | |
+  |                        ^            | - proj      | |  
+  |                        |            | - feat      | |  
+  |                 +------+-------\    |   cGRE  {d} | |  +--- drak -------+
+  |           /---->| sci 8 cRED   |    +-------------+ |  | +------------\ |
+  |           |     \--------------+         /---=-----------| sci 6 cGRE | |
+  |           |            ^                 |  merge   |  | \------------+ |
+  |     merge |            |                 |          |  |                |
+  |           |     +------+-------\         |          |  |                |
+  |           :     | sci 7 cRED   |<--------/          |  | +------------\ |
+  |           |     \--------------+ /----------=----------->| sci 5 cYEL | |
+  |           |            ^         |      branch      |  | \------------+ |
+  |           |            |         |                  |  |                |
+  | +-------------\ +------+----------\ +-------------+ |  +----------------+
+  | | sci 3 cGRE  | | sci 4 v0.1 cGRE | | =Changelog= | |                  
+  | \-------------+ |                 *-*             | |                  
+  |          ^      \-----------------+ | v0.1        | |      Glossary       
+  |          |             ^            | - science   | |   +---------------\
+  | +--------+----\        |            |   cGRE  {d} | |   | easy cGRE     |
+  | | sci 2 cYEL  | +------+-------\    +-------------+ |   \---------------+
+  | \-------------+ | sci 1 cGRE   |                    |   +---------------\
+  |          ^      \-+------------+                    |   | slow/big cYEL |
+  |          | branch |    ^                            |   \---------------+
+  |          \----=---/    |                            |   +---------------\
+  |                 +------+-------\                    |   | painful  cRED |
+  |                 | sci 0 cYEL   |                    |   \---------------+
+  |                 \--------------+                    |  
+  |                                                     |  
+  +-----------------------------------------------------+
+#+END_SRC
+
+#+RESULTS:
+[[file:hg-init-workflow-svn-cost.png]]
+
+** Workflow: Mercurial
+
+***                                                                   :BMCOL:
+    :PROPERTIES:
+    :BEAMER_col: 0.45
+    :END:
+
+#+BEGIN_SRC ditaa :file hg-init-workflow-hg.png 
+  +--- arne --------------------------------------------+
+  |                 +-----------------\ +-------------+ |
+  |                 | sci 9 v0.2 cBLU | | =Changelog= | |
+  |                 |                 *-*             | |      Workflow
+  |                 \-----------------+ | v0.2        | |
+  |                        ^            | - proj      | |  
+  |                        |            | - feat      | |  
+  |                 +------+-------\    |          {d}| |  +--- drak -------+
+  |           /---->| sci 8 feat   |    +-------------+ |  | +------------\ |
+  |           |     \--------------+         /---------------| sci 6 hack | |
+  |           |            ^                 |  merge   |  | \------------+ |
+  |     merge |            |                 |          |  |                |
+  |           |     +------+-------\         |          |  |                |
+  |           |     | sci 7 joined |<--------/          |  | +------------\ |
+  |           |     \--------------+ /---------------------->| sci 5 proj | |
+  |           |            ^         |                  |  | \------------+ |
+  |           |            |         |                  |  |                |
+  | +-------------\ +------+----------\ +-------------+ |  +----------------+
+  | | sci 3 works | | sci 4 v0.1 cBLU | | =Changelog= | |                  
+  | \-------------+ |                 *-*             | |                  
+  |          ^      \-----------------+ | v0.1        | |      Glossary      
+  |          |             ^            | - science   | |   +--------------\
+  | +--------+----\        |            |         {d} | |   | release cBLU |
+  | | sci 2 plan  | +------+-------\    +-------------+ |   \--------------+
+  | \-------------+ | sci 1 works  |                    |   +--------------\
+  |          ^      \-+------------+                    |   | commit       |
+  |          | branch |    ^                            |   \--------------+
+  |          \--------/    |                            |       automatic
+  |                 +------+-------\                    |    ------------->
+  |                 | sci 0 init   |                    |        manual     
+  |                 \--------------+                    |    ------=------> 
+  |                                                     |  
+  +-----------------------------------------------------+
+#+END_SRC
+
+#+RESULTS:
+[[file:hg-init-workflow-svn.png]]
+
+*** Cost: Mercurial                                                   :BMCOL:
+    :PROPERTIES:
+    :BEAMER_col: 0.45
+    :END:
+#+BEGIN_SRC ditaa :file hg-init-workflow-hg-cost.png
+  +--- arne --------------------------------------------+
+  |                 +-----------------\ +-------------+ |
+  |                 | sci 9 v0.2 cGRE | | =Changelog= | |
+  |                 |                 *-*             | |      Workflow
+  |                 \-----------------+ | v0.2        | |
+  |                        ^            | - proj      | |  
+  |                        |            | - feat      | |  
+  |                 +------+-------\    |   cGRE  {d} | |  +--- drak -------+
+  |           /---->| sci 8 cGRE   |    +-------------+ |  | +------------\ |
+  |           |     \--------------+         /---------------| sci 6 cGRE | |
+  |           |            ^                 |  merge   |  | \------------+ |
+  |     merge |            |                 |          |  |                |
+  |           |     +------+-------\         |          |  |                |
+  |           |     | sci 7 cGRE   |<--------/          |  | +------------\ |
+  |           |     \--------------+ /---------------------->| sci 5 cGRE | |
+  |           |            ^         |                  |  | \------------+ |
+  |           |            |         |                  |  |                |
+  | +-------------\ +------+----------\ +-------------+ |  +----------------+
+  | | sci 3 cGRE  | | sci 4 v0.1 cGRE | | =Changelog= | |                  
+  | \-------------+ |                 *-*             | |                  
+  |          ^      \-----------------+ | v0.1        | |      Glossary       
+  |          |             ^            | - science   | |   +---------------\
+  | +--------+----\        |            |   cGRE  {d} | |   | easy cGRE     |
+  | | sci 2 cGRE  | +------+-------\    +-------------+ |   \---------------+
+  | \-------------+ | sci 1 cGRE   |                    |   +---------------\
+  |          ^      \-+------------+                    |   | slow/big cYEL |
+  |          | branch |    ^                            |   \---------------+
+  |          \--------/    |                            |   +---------------\
+  |                 +------+-------\                    |   | painful  cRED |
+  |                 | sci 0 cGRE   |                    |   \---------------+
+  |                 \--------------+                    |  
+  |                                                     |  
+  +-----------------------------------------------------+
+#+END_SRC
+
+#+RESULTS:
+[[file:hg-init-workflow-hg-cost.png]]
 
 
 ** Branch and Merge: Asynchronous work