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,
	MSGID_RANDY autolearn=no autolearn_force=no version=3.4.4
X-Google-Language: ENGLISH,ASCII-7-bit
X-Google-Thread: 103376,791530e499e6a7f9
X-Google-Attributes: gid103376,public
From: Robert Dewar <robert_dewar@my-deja.com>
Subject: Re: ada writing guide
Date: 2000/04/18
Message-ID: <8dhuuu$ou5$1@nnrp1.deja.com>#1/1
X-Deja-AN: 612711370
References: <8d1rso$bir$2@bunyip.cc.uq.edu.au> <8d1vhj$hdr$1@nnrp1.deja.com>
 <8d2hig$7e6$1@nnrp1.deja.com> <38F5DF8C.1A01E5A4@utech.net>
 <8d4t07$o15$1@nnrp1.deja.com> <38F603FE.B0C3ED83@utech.net>
 <8d5dsc$c27$1@nnrp1.deja.com> <8d6hjn$j9p$1@clnews.edf.fr>
 <8d76vj$9jt$1@nnrp1.deja.com> <8d7uak$1d1$1@wanadoo.fr>
 <8dfd6q$uch$1@nnrp1.deja.com> <87em84vavt.fsf@deneb.cygnus.argh.org>
 <8dfpj7$crs$1@nnrp1.deja.com> <8dgk8i$ak4$1@nnrp1.deja.com>
 <8dhqi7$jv3$1@nnrp1.deja.com>
X-Http-Proxy: 1.0 x23.deja.com:80 (Squid/1.1.22) for client 205.232.38.14
Organization: Deja.com - Before you buy.
X-Article-Creation-Date: Tue Apr 18 15:28:53 2000 GMT
X-MyDeja-Info: XMYDJUIDrobert_dewar
Newsgroups: comp.lang.ada
X-Http-User-Agent: Mozilla/4.61 [en] (OS/2; I)
Date: 2000-04-18T00:00:00+00:00
List-Id: <comp.lang.ada>

In article <8dhqi7$jv3$1@nnrp1.deja.com>,
  Ted Dennison <dennison@telepath.com> wrote:

> Yes, the old versions are still there. But in order for
version 1.2 to
> be based on version 1.1, the person who created 1.2 had to
have been
> working from version 1.1 (and not 1.0). Right?

Robert is a bit incredulous here (and again wonders what
kind of configuration management is used in Ted's company).

Of *course* if you update a file, you have to worry about not
blotting out changes done to previous versions.

This is achieved in one of two ways

1. You merge changes yourself, always going from the most
recently checked in version.

2. You use an automatic merge facility such as that provided
in CVS.

I personally prefer the first approach, but many find the second
approach fine.

T.E.D. seems to be describing a system in which people use
neither approach, and merrily destroy one anothers fixes by
updating old versions. I would NOT call this version control
at all.


Sent via Deja.com http://www.deja.com/
Before you buy.