From owner-freebsd-current Tue Feb 25 12:53:04 1997 Return-Path: Received: (from root@localhost) by freefall.freebsd.org (8.8.5/8.8.5) id MAA15248 for current-outgoing; Tue, 25 Feb 1997 12:53:04 -0800 (PST) Received: from sax.sax.de (sax.sax.de [193.175.26.33]) by freefall.freebsd.org (8.8.5/8.8.5) with SMTP id MAA15204 for ; Tue, 25 Feb 1997 12:52:42 -0800 (PST) Received: (from uucp@localhost) by sax.sax.de (8.6.12/8.6.12-s1) with UUCP id VAA27121 for freebsd-current@FreeBSD.ORG; Tue, 25 Feb 1997 21:52:38 +0100 Received: (from j@localhost) by uriah.heep.sax.de (8.8.5/8.8.5) id UAA13066; Tue, 25 Feb 1997 20:54:55 +0100 (MET) Message-ID: Date: Tue, 25 Feb 1997 20:54:55 +0100 From: j@uriah.heep.sax.de (J Wunsch) To: freebsd-current@FreeBSD.ORG Subject: Re: anoncvs server References: <199702250305.NAA11041@genesis.atrad.adelaide.edu.au> <199702251812.LAA26720@phaeton.artisoft.com> X-Mailer: Mutt 0.55-PL10 Mime-Version: 1.0 X-Phone: +49-351-2012 669 X-PGP-Fingerprint: DC 47 E6 E4 FF A6 E9 8F 93 21 E0 7D F9 12 D6 4E Reply-To: joerg_wunsch@uriah.heep.sax.de (Joerg Wunsch) In-Reply-To: <199702251812.LAA26720@phaeton.artisoft.com>; from Terry Lambert on Feb 25, 1997 11:12:52 -0700 Sender: owner-current@FreeBSD.ORG X-Loop: FreeBSD.org Precedence: bulk As Terry Lambert wrote: > 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.) -- cheers, J"org joerg_wunsch@uriah.heep.sax.de -- http://www.sax.de/~joerg/ -- NIC: JW11-RIPE Never trust an operating system you don't have sources for. ;-)