Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 22 Mar 1997 20:44:09 +0800
From:      Peter Wemm <peter@spinner.DIALix.COM>
To:        joerg_wunsch@uriah.heep.sax.de (Joerg Wunsch)
Cc:        bde@zeta.org.au (Bruce Evans), jkh@time.cdrom.com, cvs-all@freefall.freebsd.org, CVS-committers@freefall.freebsd.org, cvs-share@freefall.freebsd.org, jkh@freefall.freebsd.org
Subject:   Re: cvs commit: src/share/doc/handbook ... 
Message-ID:  <199703221244.UAA24780@spinner.DIALix.COM>
In-Reply-To: Your message of "Sun, 16 Mar 1997 11:23:41 %2B0100." <19970316112341.LC40404@uriah.heep.sax.de> 

next in thread | previous in thread | raw e-mail | index | archive | help
J Wunsch wrote:
> As Bruce Evans wrote:
> 
> > `cvs -j' seems to be more braindamaged than I thought.
> 
> I also noticed during the release engineering that it's royally
> broken.  It often resulted in not applying the patch at all.
> 
> Right now, using it for serious work is a pain in the *ss.

Yes, it's broken by design.  'cvs update -jHEAD' is basically the 
equivalent of: 'cvs rdiff -rRELENG_2_2_BP -rHEAD | patch'.  Each time you 
run it, it gets progressively worse since it has no memory of you doing 
the merge last time, or the time before that, or before that, and so on.  
This is one area that perforce is excellent!!

Cheers,
-Peter





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