开发者

Can Subversion merge 2 projects without branching first?

开发者 https://www.devze.com 2023-03-10 19:13 出处:网络
I am in the process of migrating several projects from SourceSafe to Subversion. However, one project is in the middle of development. That project is not currently branched in SourceSafe, however the

I am in the process of migrating several projects from SourceSafe to Subversion. However, one project is in the middle of development. That project is not currently branched in SourceSafe, however the last release was labeled (tagged) in SourceSafe so I can get a copy of it.

If I get a working copy of that SourceSafe label (tag) and commit it to Subversion as th开发者_如何学编程e "trunk", then commit my current working copy with the latest changes to a subdirectory below the "branches" directory for the same project, is it then possible to merge my projects together when I have completed the development in the branch? Or does Subversion only allow merging if a branch was done first?

I am open for suggestions on how to best migrate this project (both trunk and branch) into Subversion if the above question is totally out of line. I am a newbie with Subversion, and have only tried branching in SourceSafe.


why not copy over working version to both trunk and your own branch. Then you can start working on your own branch and check back in your changes.

I am new to SBN as well. (used Perforce in the past). but SVN doesnt seem to have check out history, so you can check out as many time as you want from number of locations. In perforce, it doesnt allow you that ( you had to create workspace for it).

So in your case, you can check in/commit in both locations (trunk and branches) and then commit your changes to your own branch

0

精彩评论

暂无评论...
验证码 换一张
取 消