I have following situation in my project:
There will be 2 source code repositories however each of them should have “shared” area for some part of code (potentially more than one).
Lets assume following structure of repositories and their folders (and files within these folders).
Repo1
- folderA
- folderB
- folderC
Repo2
- folderA
- folderD
- folderE
“folderA” should contain exactly same “copies” of files. So when I commit some change to Repo1/folderA and then checkout/update Repo2/folderA, I should be able to see these changes. Of course it would be great if it could work the same in opposite direction.
Unfortunately I cannot structure source code in another way and create some kind of shared library.
I’m looking for VCS that could help me with solving this problem in a best way (SVN, Git, …)? Do you have any experience with this kind of setup and could you recommend something?
If you are using Subversion, then you could use externals, which will allow you to have a single folder in your repository with the shared code, and each of the trunks in your two project folders would have their externals property set to point to this shared repository location.
It’s two way, so you can make changes to the shared folder and they will be picked up when you update either project folder, or you can make changes from the local project folder, and they will be submitted to the shared repository folder.
However, you should be aware of the issues with externals.
Another option may be to completely seperate the source of the shared code into a third party library, and then use NuGet for easy deployment of that library to your various projects. TeamCity for example can build NuGet packages (and acts as a NuGet package server) for you on commits of your shared library code.