Re: Sticky tags

[Mark]

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

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