Re: branch updates from mainline ?

[Derek R. Price]

Ken Versteeg wrote:

> on the branch, you can do:
>
> cvs update -j HEAD
>
> This will do what you want to do.

The first time, but you'll really want start & end tags to get repeated
merges right.  Review the "Branching & Merging" sections of the Cederqvist:
http://cvshome.org/docs/manual/cvs.html .

Merging the same section of code twice will often be handled properly with
a message like, "Changes between X & Y are already contained in Z", but
doing it too much (building up a lot of code to repeatedly remerge) may
eventually strain the merging algorithm, leaving you to resolve the same
conflicts every time you merge.

Some of the best practices papers & web pages people have been talking
about on the list recently might give you some more hints.

Derek

--
Derek Price                      CVS Solutions Architect ( http://CVSHome.org )
mailto:address@hidden     OpenAvenue ( http://OpenAvenue.com )
--
Confucius say, "Man who live in glass house dress in basement."