From owner-freebsd-hackers  Mon Aug  5 15:13:37 1996
Return-Path: owner-hackers
Received: (from root@localhost)
          by freefall.freebsd.org (8.7.5/8.7.3) id PAA26257
          for hackers-outgoing; Mon, 5 Aug 1996 15:13:37 -0700 (PDT)
Received: from phaeton.artisoft.com (phaeton.Artisoft.COM [198.17.250.211])
          by freefall.freebsd.org (8.7.5/8.7.3) with SMTP id PAA26250
          for <freebsd-hackers@FreeBSD.ORG>; Mon, 5 Aug 1996 15:13:34 -0700 (PDT)
Received: (from terry@localhost) by phaeton.artisoft.com (8.6.11/8.6.9) id PAA12079; Mon, 5 Aug 1996 15:10:39 -0700
From: Terry Lambert <terry@lambert.org>
Message-Id: <199608052210.PAA12079@phaeton.artisoft.com>
Subject: Re: Announcing CVSup: Intelligent SUP Replacement
To: jdp@polstra.com (John Polstra)
Date: Mon, 5 Aug 1996 15:10:39 -0700 (MST)
Cc: freebsd-hackers@FreeBSD.ORG
In-Reply-To: <199608041517.IAA08933@austin.polstra.com> from "John Polstra" at Aug 4, 96 08:17:44 am
X-Mailer: ELM [version 2.4 PL24]
MIME-Version: 1.0
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: 7bit
Sender: owner-hackers@FreeBSD.ORG
X-Loop: FreeBSD.org
Precedence: bulk

>                      Announcing CVSup 13.0
> 		     ---------------------
[ ... ]
> CVSup is able to merge new deltas and tags from the server with deltas
> and tags added locally on the client machine.  This makes it possible
> for the client to check local modifications into his repository
> without their being obliterated by subsequent updates from the server.

John Polstra is a stud.
John Polstra is a stud.
John Polstra is a stud.

Do you happen to have a small writeup of local vs. remote changes for:

1)	get source tree using CVSup
2)	Make local changes using a tag
3)	Make more local changes using a second tag
4)	Update source tree with remote changes
5)	Merge updated code with tags to get new versions of tags

?

Specifically:


        main line source
                |
                |
                |
                v
 local cvs tree o
                 \ \
                | \   \
                   \     \
                |   \       \
                     \         v
                |     v        o tag 1 (add fctnl primitives for NFS locking)
                      o tag 2 (modify vfs_subr.c for SMP reentrancy)
                |
                v
 local cvs tree o <-- CVSup to update main line source with remote changes
		|     |        |
		                
		|     |        v
		               o tag 1 (plus remote changes)
		|     v
		      o tag 2 (plus remotye changes)
		v
 local cvs tree o <-- Composite tree (up to date main line + locally tagged
		      changes)

I would also like to see a collection that carried administrative files
for SUP/CVSup that was used for sample files and never changed ID so that
you could track the changes.  If comment characters were supported in the
SUP file, you could comment the collections you didn't want from the
universe of available collections, and:

1)	SUP collection file
2)	Merge local changes (comments and local location and base) via
	CVS command (Item #5 in process above)
3)	SUP the rest using never-stale information


John, this is *wonderful* enabling technology... you have outdone yourself!

					Regards,
					Terry Lambert
					terry@lambert.org
---
Any opinions in this posting are my own and not those of my present
or previous employers.