From owner-freebsd-current Tue Feb 25 15:05:24 1997 Return-Path: Received: (from root@localhost) by freefall.freebsd.org (8.8.5/8.8.5) id PAA22510 for current-outgoing; Tue, 25 Feb 1997 15:05:24 -0800 (PST) Received: from phaeton.artisoft.com (phaeton.Artisoft.COM [198.17.250.50]) by freefall.freebsd.org (8.8.5/8.8.5) with SMTP id PAA22497 for ; Tue, 25 Feb 1997 15:05:10 -0800 (PST) Received: (from terry@localhost) by phaeton.artisoft.com (8.6.11/8.6.9) id QAA27049; Tue, 25 Feb 1997 16:02:32 -0700 From: Terry Lambert Message-Id: <199702252302.QAA27049@phaeton.artisoft.com> Subject: Re: anoncvs server To: joerg_wunsch@uriah.heep.sax.de Date: Tue, 25 Feb 1997 16:02:32 -0700 (MST) Cc: freebsd-current@freebsd.org In-Reply-To: from "J Wunsch" at Feb 25, 97 08:54:55 pm X-Mailer: ELM [version 2.4 PL24] MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Sender: owner-current@freebsd.org X-Loop: FreeBSD.org Precedence: bulk > > The answer I have received in the past: "don't check in your local > > changes and use cvs merge, and manually resolve conflicts, normally". > > This however proves that you are better in writing long articles than > in following mailing lists. > > John Polstra has explained more than once how to arrange for locally- > maintained changes _inside_ a CVS mirror tree using CVSup. (I can't > tell you what's the magic, but simply since i don't think i'm in need > of it. To the least, i remember that it's possible.) I suppose that this proves that you are better at writing ad hominim attacks than in providing useful answers to questions. For what it's worth, John was looking at changes to source management in general to address the local branch issue, as well as some of the concurrent synchronization issues I raised in previous articles. Since my article was not really an attack on John, I didn't really expect a status report until it was done (which it wasn't, the last time these questions were asked). So in any case, I think you are wrong. Regards, Terry Lambert terry@lambert.org --- Any opinions in this posting are my own and not those of my present or previous employers.