[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Fri, 23 Jun 2006 12:07:07 +0100
Thunderbird 3.0a1 (Windows/20060622)
Gerhard Siegesmund wrote:
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).
I think this is defined by your workflow. Here at my organization we
create branches to work on new features. The "live" code always is in
the trunk. This way other programmers can get the current code by just
do 'cvs co'. If you create a new branch for the current live code you
always have to communicate the new branchname to all programmers. This
(in my opinion) leads to problems.
After finishing the new code in the branch we then merge the code back
to the trunk. This also has the benefit, that you can work on two
different features at the same time without having to share code in the
trunk (the programmers are independent (more or less) and don't
interfere with each other if their code intermittently is broken). Two
seperate branches which than can be merged back to trunk.
But I really think this is dependent on your workflow.
I'm a little unclear on the implications of a merge between a branch and
the trunk. If I merge, does the branch become part of the trunk from
RE: Branches, CARTER-HITCHIN, David, GBM, 2006/06/23
RE: Branches, CARTER-HITCHIN, David, GBM, 2006/06/26
Re: Branches, Pierre Asselin, 2006/06/26
RE: Branches, CARTER-HITCHIN, David, GBM, 2006/06/28