Skip site navigation (1)Skip section navigation (2)
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
Message-ID:  <Mutt.19970209123210.j@uriah.heep.sax.de>
In-Reply-To: <199702090445.PAA14069@godzilla.zeta.org.au>; from Bruce Evans on Feb 9, 1997 15:45:55 %2B1100
References:  <199702090445.PAA14069@godzilla.zeta.org.au>

next in thread | previous in thread | raw e-mail | index | archive | help
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. ;-)



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?Mutt.19970209123210.j>