[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Recommended Merge Procedure for Trunk -> Branch

From: <Matthew.Hanson_at_micorp.com>
Date: 2004-07-14 14:13:10 CEST

Hi,

Our repository is setup as the following on Win2K platform using svn win32
1.0.5, as suggested:

$REPOS_HOME/subversion/repos
$REPOS_HOME/subversion/repos/project
$REPOS_HOME/subversion/repos/project/trunk
$REPOS_HOME/subversion/repos/project/tags

The trunk head is currently at revision 12. I have created a tagged
revision called tags/2.1 that was created (committed) as revision 11 that
is a copy of the trunk at revision 8. Several changes have been made to
the trunk since revision 8. I would like to rev up the tags/2.1 revision
to get the missing changes from the trunk (rev 12). The merging from the
docs is a little confusing, and it does not discuss reving from the trunk
with higher revision to a branch or tag at a lower revision.

Could you please help us with this. In general, our new development is
done on branches, while bug fixes, etc., are done either on the trunk or a
bug fix branch. We will certainly need to merge occassionally to get bug
fixes to the dev branches. The docs had a lot of warning about simple
direct merging from the head of one branch to the head of another, so I
don't want to mess up with a brute force attempt.

Any help or URL pointers would be appreciated.

Thanks, in advance, for checking out this post.

Regards,
Matt Hanson
Received on Wed Jul 14 14:11:25 2004

This is an archived mail posted to the Subversion Users mailing list.