blocks|key|4558611|text|对于standard+trunk/,+branches/,+tags/+structure|type|unstyled|depth|inlineStyleRanges|offset|length|style|CODE|entityRanges|data|4558612|Use中的开发和发布，使用mainline|unordered-list-item|4558613|
|4558614|Create+trunk/作为branches/中的branches/分支-您可以使用命名约定来区分它们，甚至可以用development/和release/|4558615|4558616|Use+svn+merge替换branches/来执行合并和复制-请阅读Advanced+Merging+first|4558617|
<|4558618|>G217trunk/>|4558619|4558620|entityMap|0|LINK|mutability|MUTABLE|url|http://svnbook.red-bean.com/en/1.5/svn.branchmerge.maint.html#svn.branchmerge.maint.layout|1|http://svnbook.red-bean.com/en/1.5/svn.branchmerge.advanced.html^0|B|6|J|9|U|5|2|17|0|0|0|0|7|6|F|9|Q|9|1M|C|1Z|8|0|0|4|9|F|9|10|G|1|0|0|0|0^^$0|@$1|2|3|4|5|6|7|14|8|@$9|15|A|16|B|C]|$9|17|A|18|B|C]|$9|19|A|1A|B|C]]|D|@$9|1B|A|1C|1|1D]]|E|$]]|$1|F|3|G|5|H|7|1E|8|@]|D|@]|E|$]]|$1|I|3|J|5|6|7|1F|8|@]|D|@]|E|$]]|$1|K|3|L|5|H|7|1G|8|@$9|1H|A|1I|B|C]|$9|1J|A|1K|B|C]|$9|1L|A|1M|B|C]|$9|1N|A|1O|B|C]|$9|1P|A|1Q|B|C]]|D|@]|E|$]]|$1|M|3|J|5|6|7|1R|8|@]|D|@]|E|$]]|$1|N|3|O|5|H|7|1S|8|@$9|1T|A|1U|B|C]|$9|1V|A|1W|B|C]]|D|@$9|1X|A|1Y|1|1Z]]|E|$]]|$1|P|3|Q|5|6|7|20|8|@]|D|@]|E|$]]|$1|R|3|S|5|H|7|21|8|@]|D|@]|E|$]]|$1|T|3|-4|5|6|7|22|8|@]|D|@]|E|$]]|$1|U|3|-4|5|6|7|23|8|@]|D|@]|E|$]]]|V|$W|$5|X|Y|Z|E|$10|11]]|12|$5|X|Y|Z|E|$10|13]]]]

<ol>
<li>Use the <a href="http://svnbook.red-bean.com/en/1.5/svn.branchmerge.maint.html#svn.branchmerge.maint.layout" rel="nofollow noreferrer">standard <code>trunk/</code>, <code>branches/</code>, <code>tags/</code> structure</a></li>
<li>Use <code>trunk/</code> as your mainline</li>
<li>Create branches for development and release in <code>branches/</code> - you can distinguish them using a naming convention or even replace <code>branches/</code> with <code>development/</code> and <code>release/</code></li>
<li>Use <code>svn merge</code> to perform both merges and copies - read <a href="http://svnbook.red-bean.com/en/1.5/svn.branchmerge.advanced.html" rel="nofollow noreferrer">Advanced Merging</a> first</li>
</ol>

blocks|key|4558672|text|是的，你可以在Subversion中做到这一点，这或多或少是标准做法。|type|unstyled|depth|inlineStyleRanges|entityRanges|data|4558673|这个想法是从变化较少的较稳定的合并到较不稳定的合并，以最小化不相关的更改，这将使合并变得更加困难。|4558674|合并回主线的方法是:首先将主线中的所有更改合并到分支中，然后复制分支，即用合并后的分支替换主线。|4558675|entityMap^0|0|0|0^^$0|@$1|2|3|4|5|6|7|H|8|@]|9|@]|A|$]]|$1|B|3|C|5|6|7|I|8|@]|9|@]|A|$]]|$1|D|3|E|5|6|7|J|8|@]|9|@]|A|$]]|$1|F|3|-4|5|6|7|K|8|@]|9|@]|A|$]]]|G|$]]

Yes, you can do that in Subversion, it is more or less standard practice.

The idea is to merge from the more stable with less change to the less stable, in order to minimize unrelated changes that would make merging more difficult.

Merging back to the mainline is done by first merging all changes from the mainline into the branch, and then copying the branch, that is replacing the mainline by the merged branch.

blocks|key|1342274|text|阅读了更多关于这个主题的内容后，我发现我认为这是对在svn中的分支之间进行这种更改传播所需的准确描述。|type|unstyled|depth|inlineStyleRanges|entityRanges|data|1342275|C.+Michael+Pilato等人在Version+Control+With+Subversion一书中对此进行了描述。在小章Basic+Merging+-+Keeping+a+Branch+in+Sync中|offset|length|1342276|下面这段话是从这本书中引用的。|1342277|1342278|+Subversion知道您的分支的历史记录，并知道它何时从主干中分离出来。要将最新的、最大的主干更改复制到分支，首先要确保分支的工作副本是“干净的”-that状态报告没有本地修改。然后简单地运行：|blockquote|1342279|1342280|1342281|$+svn+merge+http://svn.example.com/repos/calc/trunk|code-block|syntax|javascript|1342282|1342283|一旦您有了一个干净的主干工作副本，您就可以将您的分支合并回其中：|1342284|1342285|1342286|$+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!"|1342287|在开始之前，请先阅读整个章节(甚至可能是整本书)。这是推荐阅读。|1342288|entityMap|0|LINK|mutability|MUTABLE|url|http://svnbook.red-bean.com/|1|http://svnbook.red-bean.com/en/1.5/svn.branchmerge.basicmerging.html#svn.branchemerge.basicmerging.stayinsync^0|0|K|V|0|1T|14|1|0|0|0|0|0|0|0|0|0|0|0|0|0^^$0|@$1|2|3|4|5|6|7|1B|8|@]|9|@]|A|$]]|$1|B|3|C|5|6|7|1C|8|@]|9|@$D|1D|E|1E|1|1F]|$D|1G|E|1H|1|1I]]|A|$]]|$1|F|3|G|5|6|7|1J|8|@]|9|@]|A|$]]|$1|H|3|-4|5|6|7|1K|8|@]|9|@]|A|$]]|$1|I|3|J|5|K|7|1L|8|@]|9|@]|A|$]]|$1|L|3|-4|5|6|7|1M|8|@]|9|@]|A|$]]|$1|M|3|-4|5|6|7|1N|8|@]|9|@]|A|$]]|$1|N|3|O|5|P|7|1O|8|@]|9|@]|A|$Q|R]]|$1|S|3|-4|5|6|7|1P|8|@]|9|@]|A|$]]|$1|T|3|U|5|K|7|1Q|8|@]|9|@]|A|$]]|$1|V|3|-4|5|6|7|1R|8|@]|9|@]|A|$]]|$1|W|3|-4|5|6|7|1S|8|@]|9|@]|A|$]]|$1|X|3|Y|5|P|7|1T|8|@]|9|@]|A|$Q|R]]|$1|Z|3|10|5|6|7|1U|8|@]|9|@]|A|$]]|$1|11|3|-4|5|6|7|1V|8|@]|9|@]|A|$]]]|12|$13|$5|14|15|16|A|$17|18]]|19|$5|14|15|16|A|$17|1A]]]]

Reading more on the subject I found what I believe is a precise description of what is needed in order to do this kind of change propagation between branches in svn.

It is descriped in the book <a href="http://svnbook.red-bean.com/" rel="nofollow noreferrer">Version Control With Subversion</a> by C. Michael Pilato et al. in the subchapter <a href="http://svnbook.red-bean.com/en/1.5/svn.branchmerge.basicmerging.html#svn.branchemerge.basicmerging.stayinsync" rel="nofollow noreferrer">Basic Merging - Keeping a Branch in Sync</a>

The follwing is cited from the book.

<blockquote>
 Subversion is aware of the history of your branch and knows when it divided away from the trunk. To replicate the latest, greatest trunk changes to your branch, first make sure your working copy of the branch is “clean”—that it has no local modifications reported by svn status. Then simply run:
</blockquote>

<pre><code>$ svn merge http://svn.example.com/repos/calc/trunk
</code></pre>

<blockquote>
 Once you have a clean working copy of the trunk, you're ready to merge your branch back into it:
</blockquote>

<pre><code>$ 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!"
</code></pre>

Please read the whole chapter (and maybe even the book) before starting on this. It is recommended reading.

Has anyone tried using the tofu-scale descriped in <a href="http://oreilly.com/catalog/9780596101855/">Practical Perforce</a> by Laura Wingerd together with svn?

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 <a href="http://oreilly.com/catalog/practicalperforce/chapter/ch07.pdf">How Software Evolves</a>

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.

<a href="http://dl.getdropbox.com/u/136976/tofu%20scale.png">Figure taken from Practical Perforce (ISBN 10: 0-596-10185-6) http://dl.getdropbox.com/u/136976/tofu%20scale.png</a>

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)

Using the tofu scale with svn

翻译质量差，导致语言生硬或混乱。

没有提供实际的解决方法或示例。

解答不清晰，无法理解或解决问题。

页面排版不美观，阅读体验差。

文章

问答

视频

学习中心

腾讯云实验室

直播

竞赛

腾讯云代码分析专区

腾讯iOA零信任安全管理系统专区

腾讯云架构师技术同盟交流圈

腾讯云数据库专区

腾讯云顾问专区

腾讯云原生专区

腾讯混元专区

腾讯云TCE专区

腾讯云Lighthouse专区

腾讯云HAI专区

腾讯云Edgeone专区

腾讯云存储专区

腾讯云智能专区

腾讯轻联专区 

腾讯云开发专区

TAPD专区

腾讯轻量云游戏服专区

腾讯云最具价值专家

腾讯云架构师技术同盟

腾讯云创作之星

腾讯云开发者先锋

腾讯云代码助手

云原生构建

TAPD 敏捷项目管理

Cloud Studio

SDK中心

API中心

命令行工具

涵盖代码开发、场景应用、自动测试全流程，助你从零构建专属AI助手

一站式MCP教程库，解锁AI应用新玩法

有没有人尝试过将Laura Wingerd在中描述的豆腐规模与svn一起使用？豆腐比例告诉我们如何在分支(代码线)之间传播更改。稳定分支中的更改应该合并到较不稳定的分支(固定到软)，而不稳定分支中的更改应该复制到稳定分支(软到固定)。请参阅这导致在开发分支中，对更稳定的分支所做的更改正在合并，从而改进开发分支中的代码，...

问将豆腐鳞片与svn结合使用
EN

Stack Overflow用户

社区

活动

圈层

关于

腾讯云开发者

热门产品

热门推荐

更多推荐

问将豆腐鳞片与svn结合使用EN