You want to merge into the branch. Your method would cause you problems
if you made a change in a file on your branch and a change was made on
mainline. See Chapter 5 of the cvs manual, Branching and merging.
Specifically section(s) 5.6 and 5.7.
donald
On Mon, Nov 27, 2000 at 02:57:23PM +0100, Steinar Bang wrote:
> I would like to do some experimentation in a branch of a module, while
> at the same time staying in sync with the main branch.
>
> If I:
> 1. tag all the files in the module with a branch tag
> 2. check out a copy of the module with the branch tag, and another
> copy of the module on the main branch
> 3. every time someone else does changes to the module, update my main
> branch copy and do a "cvs tag -F whatever_branch_tag" (is this
> enough? Or do I need a "-r" as well?)
>
> Is this right or wrong? Will it work the way I think it will work?
> Am I cluttering the repository files with branch versions that never
> will be used?
>
>
> Thanx!
>
>
> - Steinar
>
> _______________________________________________
> Info-cvs mailing list
> [EMAIL PROTECTED]
> http://mail.gnu.org/mailman/listinfo/info-cvs
_______________________________________________
Info-cvs mailing list
[EMAIL PROTECTED]
http://mail.gnu.org/mailman/listinfo/info-cvs
