From owner-freebsd-hackers Thu Aug 8 08:44:26 1996 Return-Path: owner-hackers Received: (from root@localhost) by freefall.freebsd.org (8.7.5/8.7.3) id IAA14899 for hackers-outgoing; Thu, 8 Aug 1996 08:44:26 -0700 (PDT) Received: from rover.village.org (rover.village.org [204.144.255.49]) by freefall.freebsd.org (8.7.5/8.7.3) with ESMTP id IAA14894 for ; Thu, 8 Aug 1996 08:44:20 -0700 (PDT) Received: from rover.village.org (localhost [127.0.0.1]) by rover.village.org (8.7.5/8.6.6) with ESMTP id JAA17403; Thu, 8 Aug 1996 09:41:17 -0600 (MDT) Message-Id: <199608081541.JAA17403@rover.village.org> To: Michael Graff Subject: Re: Announcing CVSup: Intelligent SUP Replacement Cc: Chuck Robey , John Polstra , Terry Lambert , freebsd-hackers@FreeBSD.org In-reply-to: Your message of 06 Aug 1996 15:05:25 EDT Date: Thu, 08 Aug 1996 09:41:16 -0600 From: Warner Losh Sender: owner-hackers@FreeBSD.org X-Loop: FreeBSD.org Precedence: bulk : How about putting the FreeBSD stuff on a branch, and let the local developer : work on the mainline. That way, cvs can do the right thing and just update : the branch, while the local developer can cvs update -j when merging is : wanted. That will also make merges safer, imho. I've been doing something similar for Linux for some time now. It works, but it is slow. And from time to time you trash the CVS files if, say, the system goes down right in the middle of a CVS import. Since CVSup wouldn't use import for the new vendor branch (which is what you are asking for), but rather just modify it, the windows are smaller. Warner