将树干合并到分支中

Question

希望这是有道理的：在Subversion中，如果我先分支一个主干再分支，我可以将来自主干的更改合并到派生分支中吗？

Answer 1

This is really not very much different from merging from trunk into a "regular" branch. The only difference is that the branched branch will be rooted in a branch instead of trunk. If you're using Subversion 1.6 with merge tracking, you can do:

$ svn copy ^/trunk ^/branches/mybranch
... hack away in trunk ...
$ svn copy ^/branches/mybranch ^/branches/myforkedbranch
... hack away in trunk

# Merge from trunk to myforkedbranch
$ cd myforkedbranch-workingcopy
$ svn merge ^/trunk .