Branches

[Ray Booysen]

Hi all

I am hoping for a little clarification around branching.  Currently we 
are not using branching at all in our code.  The tree is a straight line 
without the need for any branches.

So here comes the question.  I started on a new section of code to 
rewrite a reporting module that wasn't functioning well.  I now am 
halfway through this.  However, management have come and said because of 
timescales, can I tweak the old reporting module and leave the new code 
for a later version.  Now obviously I don't want to lose the current 
work I've done.  What is the best way to accomplish this?  Should I 
branch the code and have the new code running as a separate branch and 
tweak the old code on the trunk?  Or should the changing of the old code 
be on the branch and have the new code on the trunk?

The other developers on the team would be working on the trunk which is 
why I'd prefer to have the new code on the branch.  Which is the best 
way to handle this?

Kind Regards
Ray

--
Ray Booysen
address@hidden