Commit your changes on the main trunk, then move the branch points to the
newly commited release number. This usually only works for a single file.
There once was a tool on Molli's CVS page which helped with this kind of
applying the same modification to several branches at the same time. I think
it's name was "cvslines" or something similar.
And, BTW, moving branch tags is not obvious, but it is described somewhere
in the doc.
Rolf
[EMAIL PROTECTED]
> -----Original Message-----
> From: Prakash Ranade [SMTP:[EMAIL PROTECTED]]
> Sent: Tuesday, April 24, 2001 2:53 AM
> To: [EMAIL PROTECTED]
> Subject: Branch question
>
> Hello CVS gurus,
>
> I have a question with branches.
>
> foo.c
> /--------*--------- Branch 2.5
> /
> /
> -----------------------*---------- Main
> \
> \
> \----------------*---------- Branch 2.2
>
> I am currently working on Branch 2.2 's foo.c. The file's contents are
> same as on Main and Branch 2.5, in other words foo.c is never got
> changed since we branch out.
>
> Now, My question is the changes which I made on foo.c needs to be
> reflected on Main, and Branch 2.5's foo.c, without checkout - update -
> commit cycle.
>
> Thanks in advance.
>
> Prakash
>
_______________________________________________
Info-cvs mailing list
[EMAIL PROTECTED]
http://mail.gnu.org/mailman/listinfo/info-cvs
