0

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.

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

  • we have multiple solutions (right now, spread over different team projects)
  • we plan to have some shared code referenced in several solutions, for debugging in source format
  • right now, we have many legacy feature branches and wanted to keep a main an dev branch for the major solutions (if that workflow is decent with GIT. In TFVC I noticed that the many branches clutter the source control.)
  • build should work via build agent like before, also taking into account the shared project (changes there trigger a build)
  • history should be preserved

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.

Andreas Reiff
  • 7,961
  • 10
  • 50
  • 104

1 Answers1

2

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

  • Git repositories tends to be smaller and focused on one component
  • which TVFS can host multiple projects in one giant referential

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

  • 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.

VonC
  • 1,262,500
  • 529
  • 4,410
  • 5,250
  • I have some experience with GIT, though not on a larger professional scale. I only now started to worry about builds, the repo linking (also ended up reading on submodules, which seem to be close but not 100%ly capable of everything, like updates need to be done manually) and so on. After all, we are very used to our TFVC workflows. – Andreas Reiff Oct 10 '19 at 07:45
  • @AndreasReiff updates can be done in one go (https://stackoverflow.com/a/58195268/6309) – VonC Oct 10 '19 at 08:48