From owner-freebsd-current Sun Feb 9 03:51:16 1997 Return-Path: Received: (from root@localhost) by freefall.freebsd.org (8.8.5/8.8.5) id DAA12786 for current-outgoing; Sun, 9 Feb 1997 03:51:16 -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 DAA12766 for ; Sun, 9 Feb 1997 03:51:08 -0800 (PST) Received: (from uucp@localhost) by sax.sax.de (8.6.12/8.6.12-s1) with UUCP id MAA18595 for freebsd-current@freebsd.org; Sun, 9 Feb 1997 12:51:02 +0100 Received: (from j@localhost) by uriah.heep.sax.de (8.8.5/8.6.9) id MAA12738; Sun, 9 Feb 1997 12:32:10 +0100 (MET) Message-ID: Date: Sun, 9 Feb 1997 12:32:10 +0100 From: j@uriah.heep.sax.de (J Wunsch) To: freebsd-current@freebsd.org Subject: Re: Pppd Drops Under Heavy Load References: <199702090445.PAA14069@godzilla.zeta.org.au> 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: <199702090445.PAA14069@godzilla.zeta.org.au>; from Bruce Evans on Feb 9, 1997 15:45:55 +1100 Sender: owner-current@freebsd.org X-Loop: FreeBSD.org Precedence: bulk As Bruce Evans wrote: > >P.S. Neophite question? How do I maintain these deltas on my local tree, > >so that the next cvs checkout does not wipe them out? In this case it looks > >as if the total increase in memory footprint will be 1.25KB... but I would > >like to knowwhat is the best rule to follow. > > There is no simple way. I use separate diffs and reapply them after each > update. Don't use cvs co at all. :-) cvs update tries hard to retain local changes. Conflicts will happen only if the same spot has been changed in the repository in a different way. I used to maintain several local changes this way for quite a long time. Don't forget: ``cvs [-q] update -Pd''. -- 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. ;-)