Take the 2-minute tour ×
Programmers Stack Exchange is a question and answer site for professional programmers interested in conceptual questions about software development. It's 100% free, no registration required.

I need an advice about SVN usage.

I use Tortoise SVN on my client to deal with a project I am working on. The probjem is that I have two set of bugs top fix on the project. One to deploy till 5 days, and one to deploy till 10 days. I am going to solve all the bugs before the 5fth days but I do not want to deploy the last 5 before the release date (till 10 days).

How can I work on two separate codes and the merge all the modification? Is it possible? I have to create a branch?

share|improve this question
    
You could branch for each bug at the same time, resolve potential conflicts when merging them back, or, branch out for the first, merge back and then branch out for the second. There may be other ways of approaching this too. Was this the question about? Am I missing something? –  vpit3833 Jul 5 '12 at 2:14
    
tortoiseGit is great. –  ClintNash Jul 5 '12 at 4:33
    
I need a step-by-step adice to solve the problem –  AngeloBad Jul 5 '12 at 7:18
    
unwillingness to deploy two fixes instead of one indicates architecture / management issues rather than those of version control –  gnat Jul 5 '12 at 7:54
2  
The DVCS comment is bad because the question is about process/procedures not technical issues with the tooling - it may well be that for a given process dvcs will help but it doesn't actually address the question - its like answering "how do I find a better route to drive to work" with "buy a new car". Process first, tooling if necessary second. –  Murph Jul 5 '12 at 8:39

1 Answer 1

up vote 2 down vote accepted

Branching. Separate Branch for each bug (or batch of bug fixes), then you have complete control on when you merge back (ie release) the fixes. The book http://svnbook.red-bean.com/ is pretty good - work through that, or I'm sure there are lots of tutorials online.

share|improve this answer

Your Answer

 
discard

By posting your answer, you agree to the privacy policy and terms of service.

Not the answer you're looking for? Browse other questions tagged or ask your own question.