Re: Sticky tags

[irina sturm]

address@hidden wrote:
> 
> --- irina sturm <address@hidden> wrote:
> > I want to
> > keep up with the modifications other users
> > perform on file_1, but not on file_2.
> > I want to incorporate the other users
> > modifications on file_2 only when I've
> > finished my own modifications.
> > Then the sequence of commands to achieve
> > this is:
> >
> > cvs co file_1 (-> to get the last revision
> >               say 1.5)
> > cvs co -r1.3 file_2 (-> to get a specific
> >                       revision I want to
> >                       work on)
> > # edit file_1 and file_2
> >
> > cvs update file_1 file_2 (-> this will update
> >                       only file_1, and keep
> >                       file_2 unchanged)
> 
> correct
> 
> >
> 
> You will need to update -A on file_2 to commit it. If you didn't have to do
> this before commiting (and say the latest is 1.6), you would lose everyone
> elses modifications since version 1.3
> 
> Once you do the update -A on file_2 you can continue with this scenario...

I don't understand: if I am doing what you say,
I am not preserving myself of integrating the 
other users' modifications before finishing
with my own, but just doing the same as for file_1.
In which case also I can't understand what the
sticky tag is useful for.

What I was expecting actually is that if, for
example, v 1.5 is the last one for both file_1
and file_2, and I decide to work on the files
as above, I should do:
        cvs co file_1
        cvs co -r1.5 file_2
and then apply my scenario, and thus I will
keep up with the others' modif on file_1, 
but not on file_2 until I decide to do

        cvs update -A file_2.

Is that more clear?
Irina.


> 
> > cvs commit file_1 file_2
> >
> > # edit file_1 and file_2
> > cvs update file_1 file_2
> > cvs commit file_1 file_2
> > ...
> >
> > And when I want to integrate others' modifications
> > on file_2, I do:
> >
> > cvs update -A file_1 file_2
> > cvs commit file_1 file_2
> >
> > Is this the way it works (are my suppositions
> > and scenario above right)?
> >
> > Thanks,
> > Irina.
> >
> > _______________________________________________
> > Info-cvs mailing list
> > address@hidden
> > http://mail.gnu.org/mailman/listinfo/info-cvs
> 
> __________________________________________________
> Do You Yahoo!?
> Get personalized email addresses from Yahoo! Mail
> http://personal.mail.yahoo.com/

-- 
===========================================================
Irina STURM
Functional Verification Center of Competence - CMG 
STMicroelectronics, 9 chem de la Dhuy, 38240 MEYLAN, FRANCE
Phone: (+33) (0)4 76 58 68 90, Fax: (+33) (0)4 76 58 40 11
E-MAIL: address@hidden
===========================================================