Subversion 可以合并 2 个项目而不先分支吗？
我正在将几个项目从 SourceSafe 迁移到 Subversion。然而，有一个项目正在开发中。该项目当前没有在 SourceSafe 中分支，但是最后一个版本在 SourceSafe 中被标记（标记），因此我可以获得它的副本。
如果我获得该 SourceSafe 标签（标签）的工作副本并将其作为“主干”提交给 Subversion，然后将我当前的工作副本以及最新更改提交到同一项目的“branches”目录下的子目录，是吗？那么当我完成分支的开发后可以将我的项目合并在一起吗？或者 Subversion 是否只允许在先完成分支的情况下合并？
如果上述问题完全不合时宜，我愿意就如何最好地将这个项目（主干和分支）迁移到 Subversion 中提出建议。我是 Subversion 的新手，只尝试过在 SourceSafe 中进行分支。
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 the "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.
如果你对这篇内容有疑问，欢迎到本站社区发帖提问 参与讨论，获取更多帮助，或者扫码二维码加入 Web 技术交流群。
绑定邮箱获取回复消息
由于您还没有绑定你的真实邮箱，如果其他用户或者作者回复了您的评论，将不能在第一时间通知您！
发布评论
评论（1）
为什么不将工作版本复制到主干和您自己的分支。然后您可以开始在自己的分支上工作并检查您的更改。
我也是 SBN 的新手。 （过去使用过 Perforce）。但SVN似乎没有签出历史记录，因此您可以从多个位置签出任意次数。实际上，它不允许您这样做（您必须为其创建工作区）。
因此，在您的情况下，您可以在两个位置（主干和分支）中签入/提交，然后将更改提交到您自己的分支
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