From owner-cvs-share  Sat Mar 22 04:45:20 1997
Return-Path: <owner-cvs-share>
Received: (from root@localhost)
          by freefall.freebsd.org (8.8.5/8.8.5) id EAA21696
          for cvs-share-outgoing; Sat, 22 Mar 1997 04:45:20 -0800 (PST)
Received: from spinner.DIALix.COM (root@spinner.dialix.com [192.203.228.67])
          by freefall.freebsd.org (8.8.5/8.8.5) with ESMTP id EAA21687;
          Sat, 22 Mar 1997 04:45:06 -0800 (PST)
Received: from spinner.DIALix.COM (peter@localhost.DIALix.oz.au [127.0.0.1])
          by spinner.DIALix.COM (8.8.5/8.8.5) with ESMTP id UAA24780;
          Sat, 22 Mar 1997 20:44:09 +0800 (WST)
Message-Id: <199703221244.UAA24780@spinner.DIALix.COM>
X-Mailer: exmh version 2.0gamma 1/27/96
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 ... 
In-reply-to: Your message of "Sun, 16 Mar 1997 11:23:41 +0100."
             <19970316112341.LC40404@uriah.heep.sax.de> 
Date: Sat, 22 Mar 1997 20:44:09 +0800
From: Peter Wemm <peter@spinner.DIALix.COM>
Sender: owner-cvs-share@FreeBSD.ORG
X-Loop: FreeBSD.org
Precedence: bulk

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