[Cvsnt] Newbie Question part deux

Bo Berglund bo.berglund at telia.com
Tue Feb 19 18:34:40 GMT 2002


On Tue, 19 Feb 2002 17:49:25 +0000 (UTC), "Khalid Sheikh"
<kjsheikh at hotmail.com> wrote:

PLEASE!!!! Switch off the HTML formatting in your responses to the
list! It is next to unreadable when viewd through a news reader.
I have had to go down and manually edited ot all of the HTML tags and
stuff. Keep your postings as plaintext please.


>Bo : thanks for your help. So there is no way for developer B to
>pick and choose which files he wants from developer A.

Not with CVS. You need to install CvsWeb to do that.
But I guess that after Tony implemented the new command cvs ls in
cvsnt we can expect a browser function in a future version of WinCvs
that will give you the point and click interfcae for checkouts...

>and you mentioned something about update in the working directory 
>updating all other files also get updated, does this include all 
>the files he/she changed in his local working directory?

Yes, all files including those that developer B has been working on
will be modified to include the changes in the repository. This is
what is called patching.

> I thought there was a tag when you issue the commit command, i.e., Get the 
>clean copy, that will not bring any changes to the files that developer 
>B has changed in his local developement enviroment directory.

Nope, the "get the clean copy" will discard all edits developer B has
done to the files and make the files exactly the same as the latest
revision that exists in the repository.
Update will keep the edits from B, but it now looks like these edits
strated out from a later revision because all edits from A are now
also in the file. If the patch from A hits a position in the file
where B has made changes there will be a "Conflict" and the file will
contain special markers that sjow both edits one below the other. THis
situation must be resolved manually.

Happily this does not happen very often though.
 

>Thanks once again for all the help in advance.


/Bo
(Bo Berglund, developer in Sweden)
_______________________________________________
Cvsnt mailing list
Cvsnt at cvsnt.org
http://www.cvsnt.org/cgi-bin/mailman/listinfo/cvsnt



More information about the cvsnt mailing list