在 svn 中使用豆腐秤 [英] Using the tofu scale with svn

问题描述

有没有人试过将 Laura Wingerd 的 Practical Perforce 中描述的豆腐秤与 svn 一起使用?

Has anyone tried using the tofu-scale descriped in Practical Perforce by Laura Wingerd together with svn?

豆腐尺度告诉我们如何在分支(代码行)之间传播变化.稳定分支的变化应该合并到不太稳定的分支(firm-to-soft)，不太稳定的分支的变化应该复制到稳定的分支(soft-to-firm).请参阅软件如何发展

The tofu-scale tells us how to propagate changes between branches (codelines). Changes in stable branches should be merged to less stable branches (firm-to-soft), and changes in the less stable branches should be copied to the stable branches (soft-to-firm). See How Software Evolves

这会导致合并对更稳定分支所做的更改的开发分支，从而改进开发分支中的代码，带来新的开发和错误修复.

This results in development branches where changes made to more stable branches are being merged, and thus improving code in the development branch bringing in new development and bugfixes.

图取自 Practical Perforce (ISBN 10: 0-596-10185-6) http://dl.getdropbox.com/u/136976/tofu%20scale.png

所以问题是:你能在 svn 中做到这一点吗?在分支上工作时如何从父级更新?我从 CVS 了解到，当您想将更改合并回父分支(通常是主线)时，从一个分支更新到另一个分支会给您带来很多问题

So the question is: Can you do this in svn and if; how do you update from the parent when working on 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 mainline)

推荐答案

1. 使用标准trunk/、branch/、tags/结构
2. 使用trunk/作为你的主线
3. 在 branches/ 中创建用于开发和发布的分支 - 您可以使用命名约定来区分它们，甚至可以将 branches/ 替换为 development/和 release/
4. 使用 svn merge 执行合并和复制 - 阅读 先进行高级合并

1. Use the standard trunk/, branches/, tags/ structure
2. Use trunk/ as your mainline
3. Create branches for development and release in branches/ - you can distinguish them using a naming convention or even replace branches/ with development/ and release/
4. Use svn merge to perform both merges and copies - read Advanced Merging first

这篇关于在 svn 中使用豆腐秤的文章就介绍到这了，希望我们推荐的答案对大家有所帮助，也希望大家多多支持IT屋！