TFVC到TF GIT迁移:回购组织，包括多种解决方案和构建 [英] TFVC to TF GIT migration: repo organisation, incl multiple solutions and build

问题描述

我们正在考虑从TFVC迁移到GIT(可能托管在TFS中).

We are considering migrating from TFVC to GIT (probably hosted within TFS).

主要原因是对文件移动的不良支持，这使得进行较大的重构变得很痛苦.合并通常相当差，即使仅合并的一侧已更新，也经常要求手动解决.另一个不好的事实是，我们目前有多个团队项目，并且想(通过源代码)包含一些共享功能，当涉及多个团队项目时，这似乎很难做到.

Main reason is the bad support for file movement, which makes larger refactorings a pain. Merging generally is rather poor, often asking for manual resolution even if just one side of the merge has been updated. Another bad fact is that we currently have several team projects, and would like to include (via source) some shared functionality, this seems hard to do when several team projects are involved.

考虑到TFS的GIT回购是一个好的组织

What would be a good organisation for the GIT repo for TFS considering

• 我们有多种解决方案(目前，分布在不同的团队项目中)
• 我们计划在几种解决方案中引用一些共享代码，以便以源格式进行调试
• 现在，我们有许多旧版功能分支，并希望为主要解决方案保留一个主要的dev分支(如果该工作流程在GIT方面还不错.在TFVC中，我注意到许多分支使源代码控制混乱了.)
• 构建应该像以前一样通过构建代理进行工作，同时还要考虑共享项目(那里的更改会触发构建)
• 历史应保存

我们正在使用 https://github.com/git-tfs/git-tfs 到目前为止的迁移，这似乎还不错.我们不在乎工作项或类似项目.

We are using https://github.com/git-tfs/git-tfs for the migration so far, which seems reasonably good. We don't care much for work items or similar.

请分享您的见解.经过快速研究后，我想知道是否值得，因为这似乎是一项工作，其中包括决定回购结构以及重新建立构建项目.

Please share your insight. After some quick research I am wondering if it would be worth it, since it seems to be some work, amongst others deciding on a repo structure as well as setting up the build projects anew.

推荐答案

主要区别在于TVFS的集中方面与Git的分散性质，这意味着:

The main difference is the centralized aspect of TVFS vs. the decentralized nature of Git, which means:

• Git存储库往往更小，并且集中于一个组件
• 哪个TVFS可以在一个巨大的参照中托管多个项目

因此，请确保将git-tfs导出的Git存储库拆分为以下内容:

So make sure to split your Git repo resulting from a git-tfs export, in order to:

• 每个解决方案都有一个Git存储库
• 使用子模块将公用项目纳入主程序Git仓库

• have one Git repository per solution
• use submodules to include commons projects into your main Git repos

取决于您的构建环境，其中可能包含挑战，但包含解决方案.

Depending on your build environment, that can include challenges, but with solutions.

这篇关于TFVC到TF GIT迁移:回购组织，包括多种解决方案和构建的文章就介绍到这了，希望我们推荐的答案对大家有所帮助，也希望大家多多支持IT屋！