Re: CVS, working with branches

Just to follow up on some of what Dave already said :-)...

[2003-08-14] Daniel Wallin wrote:

>Could someone (Rene?) give me some pointers on how to work
>with several branches at the same time, for example; how do I switch
>between branches and apply patches to several branches?

IT depends on how you check out the branches.

If you check out a different tree to work on each branch you'll have to
apply patches to each tree. It's more space, but easy to understand.

The single tree approach is to switch individual files/directories between
branches in a single tree. You do a checkout/update with the sticky branch
tag for this. Here you'll need to apply patches to each branch after you
switch.

For both approaches you can merge the changes from other branches into the
one you are working on. So you can apply the patches to one branch. And
merge the changes to each branch by specifying the multiple -j<v> options
(as Dave points out). You can do that on a whole tree basis also, but that's
a bit more dangerous ;-)

If you have more specific questions, I can come up with command lines and
wincvs examples.

HTH.


-- grafik - Don't Assume Anything
-- rrivera (at) acm.org - grafik (at) redshift-software.com
-- 102708583 (at) icq


-------------------------------------------------------
This SF.Net email sponsored by: Free pre-built ASP.NET sites including
Data Reports, E-commerce, Portals, and Forums are available now.
Download today and enter to win an XBOX or Visual Studio .NET.
http://aspnet.click-url.com/go/psa00100003ave/direct;at.aspnet_072303_01/01