On 3/8/2010 8:04 AM, Ramachandran, Vishwanath(IE10) wrote:
> Hi there
> In a subversion working copy(XYZ), we are doing development in different
> branches. So the TRUNK contains the code base that is released to market.
> There are different branches which are having different version of XYZ
> Currently we want to merge XYZ 1.2 version of branch to TRUNK.
> So instead of merge, we thought of doing COPY, because merge will take
> lot of efforts here because the trunk and the branch are different
> versions altogether.
> So for COPY, we are planning to do the following steps.
> /1) Move the TRUNK to a TAG using the SVN MOVE command./
> /(2) Copy the XYZ_1.2.0_BUILD24_RELEASE_RC1 TAG to the TRUNK./
> / /
> /No need to do an explicit delete/commit on the trunk because svn move
> does a svn copy + svn delete and requires an immediate commit./
> Please review the steps and let us know, if its fine in terms of
> retaining SVN history etc….
Is there some particular reason you need to release from the trunk? And
is it worth breaking the continuity of history so you'd have to use peg
revision numbers to go backwards there?
If you use a model where most development happens on the trunk and you
branch as you near a release and need the trunk to advance with features
that won't be included in this release, then complete the release from
the branch you can avoid all of the mess and as a side effect make it
much easier to support overlapping releases if that is ever necessary.
Received on 2010-03-08 16:44:33 CET