From owner-freebsd-current Sun May 4 15:23:37 1997 Return-Path: Received: (from root@localhost) by hub.freebsd.org (8.8.5/8.8.5) id PAA20054 for current-outgoing; Sun, 4 May 1997 15:23:37 -0700 (PDT) Received: from sax.sax.de (sax.sax.de [193.175.26.33]) by hub.freebsd.org (8.8.5/8.8.5) with SMTP id PAA20046 for ; Sun, 4 May 1997 15:23:32 -0700 (PDT) Received: (from uucp@localhost) by sax.sax.de (8.6.12/8.6.12-s1) with UUCP id AAA28712 for current@FreeBSD.ORG; Mon, 5 May 1997 00:23:30 +0200 Received: (from j@localhost) by uriah.heep.sax.de (8.8.5/8.8.5) id AAA21749; Mon, 5 May 1997 00:15:53 +0200 (MET DST) Message-ID: <19970505001553.VS30472@uriah.heep.sax.de> Date: Mon, 5 May 1997 00:15:53 +0200 From: j@uriah.heep.sax.de (J Wunsch) To: current@FreeBSD.ORG Subject: Re: Help with merging in local changes with CVS etc... References: <19970504202400.RH45263@uriah.heep.sax.de> <199705041921.MAA14503@phaeton.artisoft.com> X-Mailer: Mutt 0.60_p2-3,5,8-9 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: <199705041921.MAA14503@phaeton.artisoft.com>; from Terry Lambert on May 4, 1997 12:21:58 -0700 Sender: owner-current@FreeBSD.ORG X-Loop: FreeBSD.org Precedence: bulk As Terry Lambert wrote: > > Yep, but this wasn't the problem of the guy asking. Your set of > > problems is quite different from his. > > He wanted to commit changes to his local tree, and have them not > stomped on CVSup/CTM update. No, he actually didn't. Turn off your read flag, and re-read his mail, then you'll notice it. All he wanted was to make sure that his local ppa driver won't be killed by the next cvs update. That's a standard CVS feature. -- 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. ;-)