Re: CVS, working with branches

Daniel Wallin <[email protected]> writes:

> 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?

First you update the file or directory out "on the branch" you want to
modify with

       cvs up -r<branch-name> [<filenames>...]

Then you "cvs edit" it, if you want to be super-cooperative or if you
check out read-only by default (e.g. CVSREAD env var is set).

Then you make your changes.  This may take the form of editing, or of
merging changes you've made on some other branch, e.g.:

        cvs up [-j<v1>] -j<v2> [<filenames>...]

Then you "cvs commit".

To get back to the main trunk you can

       cvs up -A [<filenames>...]

HTH,       
-- 
Dave Abrahams
Boost Consulting
www.boost-consulting.com



-------------------------------------------------------
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