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

Re: Multiple Product lines

From: Ryan Schmidt <subversion-2006c_at_ryandesign.com>
Date: 2006-07-12 17:15:11 CEST

On Jul 11, 2006, at 22:57, Rick Zerbs wrote:

> I had first thought of using branches for the different products,
> but thought it may be difficult -- if I made changes on the high
> tier version, how do I merge those changes in to the other tiers
> without merging the high-tier functionality?? Now I am unsure
> Subversion branches can be used in this manner.

Using branches sounds fine. When you want to bring a changeset from
one branch to another, just merge that one changeset.

For example, you've just committed r1234 to the medium-tier branch.
Now you want to bring that change over to the low- and high-tier
branches.

Change to a working copy of the low-tier branch and update it. Make
sure there are no uncommitted changes in the working copy. Merge in
the change that you made in medium-tier r1234:

svn merge url://to/repo/project/branches/medium-tier -r1233:1234

(Here you're telling Subversion to compute the difference between
revisions 1233 and 1234 of the medium-tier branch and apply them to
the current working copy.)

Test the working copy, making sure the change is there and works
properly, then commit the change, stating in your commit message that
you're merging in revision 1234 from the medium-tier branch.

Now repeat that in a working copy of the high tier.

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Wed Jul 12 17:17:24 2006

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