Solved

Maintaining old software product versions in TFS

Posted on 2014-01-29
5
324 Views
Last Modified: 2014-01-31
We used to have the usual regular software releases - once or twice a year - and branched our code in TFS in order to support hotfixes or patches - whatever you want to call them.

Now we are releasing a new version every two weeks and are trying to figure the best way to manage hotfxes. One option of course is just to assume people will upgrade to the latest version, but in some cases that isn't practical, so I was trying to think of how TFS could support this.

Each release gets labelled, so getting the original code isn't a problem, it is making sure you have the current patched code if no branching is being done.

I did wonder about having each developer check in their hotfix changes to a shelveset with the label name in it - so getting the latest hotfixed version would be a matter of finding all the shelvesets containing that label name and checking them out in date order, but TFS doesn't support searching on shelveset names.

I then wondered about developers sharing the same shelveset - to the same shelveset would be used to store all the hotfix changes for a particular version - but developers can't check in to a shelveset that someone else created.

So can anyone think of a good solution to this?
0
Comment
Question by:purplesoup
  • 2
  • 2
5 Comments
 
LVL 96

Expert Comment

by:Bob Learned
ID: 39819814
I remember a Branching and Merging Guide, that explained the different options depending on your requirements, but I am having a difficult time finding that nice pictures that showed each option flow.

I am thinking it might be this:

Chapter 5 – Defining Your Branching and Merging Strategy
http://msdn.microsoft.com/en-us/library/bb668955.aspx
0
 

Author Comment

by:purplesoup
ID: 39820285
Thanks - this is the thing, we can't branch every two weeks things would just get crazy, that's why we're looking at what other options exist.
0
 
LVL 96

Accepted Solution

by:
Bob Learned earned 350 total points
ID: 39820677
If you are saying that you apply hot fixes that frequently, then I would agree that you are in a pickle...

You are going to need an area where multiple developers can work on the same code set, and branching is the only way that I can think of right now.  I never needed to figure out any other way.  I certainly am not in the situation where I create that many branches, but I do understand the headache that can cause.

I was reading a few discussions, like this one, that sounds familiar here:

Why create release branch with Hotfix branch?
http://vsarbranchingguide.codeplex.com/discussions/349773

I ran out of time this morning, but here is a possibility that might get what you want:

Simplifying TFS: Applying hot fixes without branching
http://www.olegsych.com/2009/04/simplifying-tfs-applying-hot-fixes-without-branching/
0
 
LVL 39

Assisted Solution

by:Kyle Abrahams
Kyle Abrahams earned 150 total points
ID: 39820924
To keep things more manageable you might force them to upgrade.  EG:  If you're 3-4 for versions back, you must update to the latest program.  

Branch by Release is the most sound model that I've heard of.   Maybe you can make it modified in your case.  EG:  Do a branch by major release (say, once per quarter).  All hotfixes for that major release get checked into that branch (and merged to the trunk and any later branches, of course).  If people need the hotfix they'll need to update to the latest code of that branch at least.  The brances could survive a year before dropping off and being forced to upgrade.

To replicate your minor releases a label would be needed on that branch.  But the support approach would be to always update to the latest specific update of that branch.
0
 

Author Closing Comment

by:purplesoup
ID: 39823647
Thanks that's all very helpful.
0

Featured Post

IT, Stop Being Called Into Every Meeting

Highfive is so simple that setting up every meeting room takes just minutes and every employee will be able to start or join a call from any room with ease. Never be called into a meeting just to get it started again. This is how video conferencing should work!

Join & Write a Comment

Suggested Solutions

In my previous two articles we discussed Binary Serialization (http://www.experts-exchange.com/A_4362.html) and XML Serialization (http://www.experts-exchange.com/A_4425.html). In this article we will try to know more about SOAP (Simple Object Acces…
A long time ago (May 2011), I have written an article showing you how to create a DLL using Visual Studio 2005 to be hosted in SQL Server 2005. That was valid at that time and it is still valid if you are still using these versions. You can still re…
It is a freely distributed piece of software for such tasks as photo retouching, image composition and image authoring. It works on many operating systems, in many languages.
This is Part 3 in a 3-part series on Experts Exchange to discuss error handling in VBA code written for Excel. Part 1 of this series discussed basic error handling code using VBA. http://www.experts-exchange.com/videos/1478/Excel-Error-Handlin…

746 members asked questions and received personalized solutions in the past 7 days.

Join the community of 500,000 technology professionals and ask your questions.

Join & Ask a Question

Need Help in Real-Time?

Connect with top rated Experts

12 Experts available now in Live!

Get 1:1 Help Now