From: Phil Richards (news_at_[hidden])
Date: 2007-08-02 13:41:06
On 2007-08-01, Robert Ramey <ramey_at_[hidden]> wrote:
> Phil Richards wrote:
> > This means that all the release manager needs to do is coordinate
> > the order of deliveries to the trunk, and perform the final "replace
> > trunk code with branch code" operation.
> How is this different from merging the branch into the "Current Release"
> (or trunk or next release)?
It isn't. Because the branch is up-to-date with respect to the trunk
(from the immediately previous trunk-to-branch merge), a merge from
branch-to-trunk just does the "replace trunk code with branch code".
There can be no conflicts, or, in fact, any modification to the code
that is coming from the branch during this merge operation.
Life will be considerably easier when SVN 1.5 comes out since it will
handle merge points automatically.
-- change name before "@" to "phil" for email
Boost list run by bdawes at acm.org, gregod at cs.rpi.edu, cpdaniel at pacbell.net, john at johnmaddock.co.uk