Shared code considerations - multiple branches

Aug 13, 2008 at 3:54 PM
Hi all.
I have been trying to restructure our source control according to best practices outlined in tfsguide. Everything has worked out great so far eliminating some of the awkwardness we have experienced with the previous setup. However I am having some problems with shared projects.
The chapter "Shared Code Considerations" in "How To: Structure your windows applications for team foundation server" (http://www.codeplex.com/Project/Download/FileDownload.aspx?ProjectName=VSTSGuidance&DownloadId=9473) points out two ways to handle shared projects:

  • Reference the code from a shared location
  • Branch the shared code
I am trying to go with the branching strategy but have run into a snag - what to do when you have multiple branches of the same shared project? In my case this is a shared util project that I have branched into two projects that both are dependencies for the third project. Now I have two possibly different branches of the shared code and have no way of referencing both of them in the solution file for the third project. Is there a workaround or do I need to create a third branch into the third project where I merge changes from the other two and reference only that branch?

I have been posting on MSDN about this scenario but so far have gotten no response (http://forums.microsoft.com/MSDN/ShowPost.aspx?PostID=3689115&SiteID=1)

I am hoping that someone here would be able to clarify what to do in this scenario as I am pretty lost atm.

Thanks in advance.