From owner-freebsd-stable  Fri Jun  7 17:35:52 1996
Return-Path: owner-stable
Received: (from root@localhost)
          by freefall.freebsd.org (8.7.5/8.7.3) id RAA09172
          for stable-outgoing; Fri, 7 Jun 1996 17:35:52 -0700 (PDT)
Received: from freefall.freebsd.org (localhost.cdrom.com [127.0.0.1])
          by freefall.freebsd.org (8.7.5/8.7.3) with ESMTP id RAA09150;
          Fri, 7 Jun 1996 17:35:43 -0700 (PDT)
Message-Id: <199606080035.RAA09150@freefall.freebsd.org>
To: Nate Williams <nate@sri.MT.net>
cc: "Jordan K. Hubbard" <jkh@time.cdrom.com>,
        hackers@freebsd.org (FreeBSD Hackers),
        freebsd-stable@freebsd.org (FreeBSD Stable Users),
        FreeBSD-current@freebsd.org (FreeBSD current users)
Subject: Re: The -stable problem: my view 
In-reply-to: Your message of "Fri, 07 Jun 1996 17:06:47 MDT."
             <199606072306.RAA01251@rocky.sri.MT.net> 
Date: Fri, 07 Jun 1996 17:35:43 -0700
From: "Justin T. Gibbs" <gibbs@freefall.freebsd.org>
Sender: owner-stable@freebsd.org
X-Loop: FreeBSD.org
Precedence: bulk

>> 4. You go to do another merge into -stable and wind up with a whole *mess*
>>    of conflicts.  `cvs update -j' is NOT a decent merge tool!
>
>I don't use 'cvs update -j' to merge it into -stable.  'merge' doesn't
>work when you've already merged.  What *I* do is this, which is a bit
>more work but does do the job 95% of the time.

Can't use use some "-r"'s with -j to make this work better?  Granted
you still have to look at the log file.

>Nate

--
Justin T. Gibbs
===========================================
  FreeBSD: Turning PCs into workstations
===========================================