[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: locked files
From: |
Noel L Yap |
Subject: |
Re: locked files |
Date: |
Tue, 31 Oct 2000 08:46:04 -0500 |
address@hidden on 2000.10.30 13:21:30
>> This topic has been discussed numerous times and I still haven't seen an
>> absolute need to use "cvs admin -l".
>
>Well, some people don't trust that if someone gets a conflict when
>trying to merge, that the resulting file will be OK, because of human
>errors.
Whether a human does a manual merge (which is even more error-prone than
automating the merge), developers should always double-check the result of the
merge, anyway. Moreover, regression testing will catch semantic conflicts that
no merge tool can detect and humans will often miss.
>Locking stalls development, but encourages that one person does some right
>without disturbance from others.
"cvs edit -c" encourages communication (in which case, developers may decide to
work serially) and allows concurrent development -- the best of both worlds.
Noel
This communication is for informational purposes only. It is not intended as
an offer or solicitation for the purchase or sale of any financial instrument
or as an official confirmation of any transaction. All market prices, data
and other information are not warranted as to completeness or accuracy and
are subject to change without notice. Any comments or statements made herein
do not necessarily reflect those of J.P. Morgan & Co. Incorporated, its
subsidiaries and affiliates.