Re: CVS - setup reserved checkout

[Mark]

--- Bryon Lape <address@hidden> wrote:
> Kaz Kylheku wrote:
> 
> > CVS doesn't require hand merging.  When you perform a cvs update
> > operation, then new changes in the repository are automatically
> > incorporated into your working copy. Only when a conflict arises do
> > you have to do resolution by hand. Conflicts tend to occur rarely, and
> > are usually very easy to resolve.
> 
> Conflicts are extremely easy to produce and may not be easily resolved.

The issue it seems you are having is that on a regular basis, two or more
developers making large abouts of unrelated changes to same sections of code.
This problem cannot be solved by locking checkouts, or by any change control
tool.

It doesn't matter whether you use checkout locking or not, merging will take
place (the end result is the same, 2 developers apply 2 deltas to the same
file). On the one hand 2 people can implement the changes at the same time then
merge them. On the other hand 1 person can make changes while the other waits,
then the other person can add (read "merge in") his changes as he creates them.

Developers that work on code must at least understand and communicate with each
other, at the very least, with regards to the source code they jointly modify.
How can one devloper make a change to filea and then a other developer modify
the same code in filea, and not know how to merge the two changes in CVS? If
the developer can't easily merge the changes, how can the developer easily add
(read "merge in") his changes to a file containing the 1st developers changes
in a locking system?



__________________________________________________
Do You Yahoo!?
Make a great connection at Yahoo! Personals.
http://personals.yahoo.com