Geek Answers Handbook

Using tofu scale with svn

Has anyone tried to use the tofu layout described in the Practical Performance by Laura Wingerd with svn?

The tofu-scale tells us how to propagate changes between branches (codons). Changes in stable industries should be combined with less stable industries (soft company), and changes in less stable industries should be copied into sustainable industries (from soft to firm). See How Software Develops

This leads to the emergence of development branches, where changes in more stable branches are combined and, thus, the code in the development branch is improved, leading to new developments and corrections.

Drawing taken from Practical Performance (ISBN 10: 0-596-10185-6) http://dl.getdropbox.com/u/136976/tofu%20scale.png

So the question is: can you do this in svn and if; how do you update a parent when working in a branch? I know from CVS that updating from one branch to another gives you a lot of problems when you want to merge your changes back into the parent branch (often being the main line)

+5
source share
3 answers
  • Use a standard structure trunk/, branches/,tags/
  • Use trunk/as the main line
  • Create branches for development and release in branches/- you can distinguish them with a naming convention or even replace branches/with development/andrelease/
  • svn merge , -
+3

, , , , , , svn.

Subversion, C. Michael Pilato et al. -

.

Subversion , . , , , "", , svn. :

$ svn merge http://svn.example.com/repos/calc/trunk

, :

$ pwd
/home/user/calc-trunk

$ svn update  # (make sure the working copy is up to date)
$ svn merge --reintegrate http://svn.example.com/repos/calc/branches/my-calc-branch
$ svn commit -m "Merge my-calc-branch back into trunk!"

, (, , ). .

+3

, Subversion, - .

, , , .

, .

+2

More articles:


All Articles