the standard practice is to keep the trunk (cvs special tag HEAD) to be your
new code (aka mainline), and the branches for what you're calling 'old code'
(aka releases).
David Carter-Hitchin.
--
Royal Bank of Scotland
Interest Rate Derivatives IT
135 Bishopsgate
LONDON EC2M 3TP
Tel: +44 (0) 207 085 1088
-----Original Message-----
From:
address@hidden
[mailto:address@hidden
org] On Behalf Of Ray Booysen
Sent: 23 June 2006 10:03
To: address@hidden
Subject: Branches
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
_______________________________________________
info-cvs mailing list
address@hidden
http://lists.nongnu.org/mailman/listinfo/info-cvs
***********************************************************************************
The Royal Bank of Scotland plc. Registered in Scotland No 90312. Registered Office: 36 St Andrew Square, Edinburgh EH2 2YB.
Authorized and regulated by the Financial Services Authority
This e-mail message is confidential and for use by the
addressee only. If the message is received by anyone other
than the addressee, please return the message to the sender
by replying to it and then delete the message from your
computer. Internet e-mails are not necessarily secure. The
Royal Bank of Scotland plc does not accept responsibility for
changes made to this message after it was sent.
Whilst all reasonable care has been taken to avoid the
transmission of viruses, it is the responsibility of the recipient to
ensure that the onward transmission, opening or use of this
message and any attachments will not adversely affect its
systems or data. No responsibility is accepted by The Royal
Bank of Scotland plc in this regard and the recipient should carry
out such virus and other checks as it considers appropriate.
Visit our websites at:
http://www.rbos.com
http://www.rbsmarkets.com
***********************************************************************************
From - Fri