RE: [PHP] Windows Source/Versioning software
| From: | Patrick Hubers | Date: | Thu, 19 Oct 2000 08:39:10 +0000 |
| Subject: | RE: [PHP] Windows Source/Versioning software | ||
| References: | 1 | Groups: | php.general |
| Request: | Send a blank email to php-general+get-21120@lists.php.net to get a copy of this message | ||
Boget, Chris wrote:
> Well, as far as I know about CVS, you don't really check a file out,
> per se, but just check the file in after you are done modifying it. Is
> this correct?
Yes, it is. Normally you check out a complete copy of the tree to your
working directory and then commit your changes back to the repository.
> If so, what happens when 2 people make a change to
> a file that are completely opposite to one another? How does CVS
> fix that?
It doesn't. It merely indicates a merging conflict for that file and
requires the user to handle it. There is an option to lock files that you're
working on, so nobody else can commit changes to those files though.
And yes, WinCVS (www.wincvs.org) works nicely, especially the latest betas.
Don't use the 1.0 stable version but simply go for the 1.1 beta, it's a lot
better (and just as stable, actually). I believe there are several scripts
that can update your webserver whenever somebody commits a file, so your
website will be kept up to date automagically.
Hope this helps
_____________________
Patrick Hubers
phubers@solve-i-t.com
Solve IT
Postbus 5063
3502 JB Utrecht
Netherlands
fax +31-20-8820913