当仅使用 Subversion 执行提交时,我应该检出完整分支吗?
我的存储库结构如下所示:
+ tags
+ trunk
+ source
+ dotnet
+ flex
+ branches
+ milestone1
+ dotnet
+ flex
+ milestone2
+ dotnet
+ flex
通常,.NET 开发人员只检查他们正在工作的分支的“dotnet”文件夹。Flex 开发人员同样检查 flex 文件夹。
当我们到达将分支合并到主干(反之亦然)时,我们确保完整的“source”和“milestoneX”文件夹位于将执行合并的计算机上。 这是为了避免部分合并,我们在这方面遇到了问题。
但是,如果对未在分支点根部检出的分支执行提交,我们是否会遇到问题? 也许带有子树合并信息?
I have a repository structure that looks like so:
+ tags
+ trunk
+ source
+ dotnet
+ flex
+ branches
+ milestone1
+ dotnet
+ flex
+ milestone2
+ dotnet
+ flex
Typically, the .NET developers only checkout the 'dotnet' folders for the branch they are working in. Flex developers likewise check out the flex folder.
When we reach a point where we are merging a branch into the trunk ( or vice-versa ) we ensure that the full 'source' and 'milestoneX' folders are on the machine that will be performing the merge. This is to avoid partial merges, with which we have had problems.
However, could we encounter issues by performing commits to a branch that is not checked out at the root of the branch point? Perhaps w/ subtree merge info?
如果你对这篇内容有疑问,欢迎到本站社区发帖提问 参与讨论,获取更多帮助,或者扫码二维码加入 Web 技术交流群。
绑定邮箱获取回复消息
由于您还没有绑定你的真实邮箱,如果其他用户或者作者回复了您的评论,将不能在第一时间通知您!
发布评论
评论(1)
不,您只能提交部分签出的分支。 重要的是,合并的文件共享相同的前身文件,但分支或提交的文件夹级别并不重要。
No, you can commit only partially checked out branches. Important is that merged files share the same predecessor, but it is not important on which folder level you branch or commit.