From owner-freebsd-hackers  Fri Jun  7 18:14:23 1996
Return-Path: owner-hackers
Received: (from root@localhost)
          by freefall.freebsd.org (8.7.5/8.7.3) id SAA13223
          for hackers-outgoing; Fri, 7 Jun 1996 18:14:23 -0700 (PDT)
Received: from rocky.sri.MT.net (rocky.sri.MT.net [204.182.243.10])
          by freefall.freebsd.org (8.7.5/8.7.3) with SMTP id SAA13218;
          Fri, 7 Jun 1996 18:14:19 -0700 (PDT)
Received: (from nate@localhost) by rocky.sri.MT.net (8.6.12/8.6.12) id TAA01864; Fri, 7 Jun 1996 19:14:08 -0600
Date: Fri, 7 Jun 1996 19:14:08 -0600
From: Nate Williams <nate@sri.MT.net>
Message-Id: <199606080114.TAA01864@rocky.sri.MT.net>
To: "Jordan K. Hubbard" <jkh@time.cdrom.com>
Cc: Nate Williams <nate@sri.MT.net>, 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: <17605.834196067@time.cdrom.com>
References: <199606072306.RAA01251@rocky.sri.MT.net>
	<17605.834196067@time.cdrom.com>
Sender: owner-hackers@freebsd.org
X-Loop: FreeBSD.org
Precedence: bulk

> > I don't use 'cvs update -j' to merge it into -stable.  'merge' doesn't
> 
> Yes, but I'd like to be able to is kinda the point.  The kinds of gyrations
> you describe as being necessary only underscore my point.. :-)

P3 isn't going to make this any easier, so you're going to have to go
through gyrations.  The complexity of merging two *very* different trees
isn't going to change, and no automatic scheme is going to make it any
easier.