svn理解问题
好吧，首先，抱歉我的英语不好...我希望你能理解
我想在我的公司使用 svn 进行软件开发的一切， 目前我们使用 cvs，但效果不是很好，我听说 关于 svn 有很多好处...
所以无论如何，我在理解如何在我们的系统中使用 svn 方面遇到了问题... 我们通常有 2 或 3 个主要版本正在开发中，比如说 例如 V1.0、V2.0 和 V3.0 V1.0 中的更改已合并到 V2.0 和 V3.0 等等...
此外，我们还在开发版本的修补程序... 所以我们当前的合并是这样的： V1.0-> V1.1-> V1.2-> V2.0-> V2.1-> V3.0
目前每个版本都是 CVS 中的一个独立分支....
我们总是可能需要针对主要版本再添加一个修补程序... 比如 V1.3（介于 1.2 和 2.0 之间） 这个新的“分支”(1.3) 将在 2.0 和 3.0 已经存在之后创建！
合并需要在 svn 中保持不变 (V1.0 -> V1.1 -> V1.2 -> V2.0 -> V.2.1 -> V3.0)
所以如果我在 1.0 中进行更改，它必须在以下每个版本中版本... V2.0 也是在 V1.2 存在之前创建的 但是当我创建 V1.2 时，更改也需要在 V2.0 中...
我搜索了很多教程，但总是只有一个活动的 每个示例中都有开发版本...但是我们有多个活动版本...
那么...我如何在 svn 中使用我们的系统？
感谢您的帮助
ok at first, sry for my bad english...i hope you understand everything
i want to use svn in my company for our software developement,
currently we use cvs but it doesn't work very well and i heard
much good things about svn...
so anyway i have a problem understanding how i should use svn with our system...
we normally have 2 or 3 major versions in developement, lets say for
example V1.0, V2.0 and V3.0
changes in V1.0 are merged to V2.0 and to V3.0 and so on...
beside that we have hotfixes in developement for the versions....
so our current merging goes like this:
V1.0 -> V1.1 -> V1.2 -> V2.0 -> V2.1 -> V3.0
currently every Version is an independent branch in CVS....
its always possible that we need one more hotfix for the major versions...
like lets say V1.3 (will be between 1.2 and 2.0)
this new "branch"(1.3) will be created after 2.0 and 3.0 already exists!
the merging needs to stay the same in svn
(V1.0 -> V1.1 -> V1.2 -> V2.0 -> V.2.1 -> V3.0)
so if i make a change in 1.0 it has to be in every following version...
also V2.0 is created before lets say V1.2 existed
but when i create V1.2 the changes also need to be in V2.0...
i searched through many tutorials but there is always only one active
developement version in every example...but we have more than one active Version...
so...how can i use our system in svn?
thank you for your help
如果你对这篇内容有疑问，欢迎到本站社区发帖提问 参与讨论，获取更多帮助，或者扫码二维码加入 Web 技术交流群。
绑定邮箱获取回复消息
由于您还没有绑定你的真实邮箱，如果其他用户或者作者回复了您的评论，将不能在第一时间通知您！
发布评论
评论（2）
如果您要切换到新的版本控制系统（又名 VCS），我邀请您使用 Git 而不是 SVN，Git 也是一个 VCS，但更新较新。它的一个主要优点是 Git 是分散的，这意味着您可以在离线时使用本地存储库。这是一个巨大的优势，这意味着您可以在无法联系服务器的情况下提交修改。 Git 的其他一些优点是它速度快并且您会喜欢的：使用分支非常容易。您可以轻松地将修改从一个分支合并到另一个分支。
如何开始发现 Git？互联网上有很多资源，Git 几个月（几年？）以来一直在炒作。您可以从该链接开始：http://git-scm.com/ 您还可以查看此演示文稿我发现获得每个概念非常有效： http://www.slideshare.net/chacon /git-101-演示文稿。
祝你好运！
If you are switching to a new version control system (aka VCS), i invite you to use Git instead of SVN, Git is also a VCS but is more recent. It has one main advantage which is that Git is decentralized, it means that you can work with your local repository while you are offline. It is a huge advantage, it means that you can commit modification without being able to contact a server. Some other advantages of Git is that it's fast and something that you are going to like : it's super easy to uses branches. You can easily merge modifications from a branch to an other.
How to start discovering Git? There are a bunch of ressources on the Internet, Git is really hype since few months (years?). You can start with that link: http://git-scm.com/ and you can also check this presentation that i find really efficient to get every concepts: http://www.slideshare.net/chacon/git-101-presentation.
Good luck!
如果您想要多个“活动”版本，我会坚持使用 CVS 中的相同模型，并为每个活动版本设置一个新分支“/root/branches/v1.1”等并确保 SVN 存储库尽早并经常合并以避免大量冲突。 Git 显然有更好的合并算法，但如果管理不当，无论选择哪种 VCS，都可能会出现合并冲突。
I'd just stick with the same model you had in CVS if you want multiple "active" versions, and setup your SVN repo with a new branch "/root/branches/v1.1", etc for each active version and make sure that you merge early and often to avoid overwhelming amounts of conflicts. Git apparently has a better merge algorithm, but merge conflicts can arise regardless of the VCS chosen if not managed correctly.