From mboxrd@z Thu Jan 1 00:00:00 1970 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on polar.synack.me X-Spam-Level: X-Spam-Status: No, score=-1.3 required=5.0 tests=BAYES_00,INVALID_MSGID autolearn=no autolearn_force=no version=3.4.4 X-Google-Language: ENGLISH,ASCII-7-bit X-Google-Thread: 103376,3c8a1ddc13ecb354 X-Google-Attributes: gid103376,public From: ok@goanna.cs.rmit.EDU.AU (Richard A. O'Keefe) Subject: Re: Configuration Management for Ada on Unix Date: 1996/05/31 Message-ID: <4omf1q$jaq@goanna.cs.rmit.EDU.AU>#1/1 X-Deja-AN: 157702686 references: <9605301407.AA03821@most> <4olq5p$6nb@f111.iassf.easams.com.au> organization: Comp Sci, RMIT, Melbourne, Australia nntp-posting-user: ok newsgroups: comp.lang.ada Date: 1996-05-31T00:00:00+00:00 List-Id: bjw@f111.iassf.easams.com.au (Brendan WALKER) writes: >The first is that CVS allows more than one user to be modifying a >file at a time, rather then the SCCS/RCS single file lock system. This >may sound crazy at first, but it is actually very good. What CVS does is >automatically "merge" the changes made on a particular version of the >file. A method of merging deltas was described some years ago. It sounded to me like a really bad idea then, and does now. The assumption here is that changes that affect different lines are independent. I have never known this to be the case. > The power of this is that you progress >from "file" change control to "line" change control. If this were "natural unit" change control, things might be different. Changes to different procedures stand a chance of being independent; changes to the same procedure are very very likely to conflict even if they don't actually affect the same lines. -- Fifty years of programming language research, and we end up with C++ ??? Richard A. O'Keefe; http://www.cs.rmit.edu.au/~ok; RMIT Comp.Sci.