From owner-freebsd-hackers  Fri Jun  7 16:00:41 1996
Return-Path: owner-hackers
Received: (from root@localhost)
          by freefall.freebsd.org (8.7.5/8.7.3) id QAA01647
          for hackers-outgoing; Fri, 7 Jun 1996 16:00:41 -0700 (PDT)
Received: from time.cdrom.com (time.cdrom.com [204.216.27.226])
          by freefall.freebsd.org (8.7.5/8.7.3) with ESMTP id QAA01607;
          Fri, 7 Jun 1996 16:00:33 -0700 (PDT)
Received: from localhost (localhost [127.0.0.1]) by time.cdrom.com (8.7.5/8.6.9) with SMTP id QAA16854; Fri, 7 Jun 1996 16:00:23 -0700 (PDT)
To: Nate Williams <nate@sri.MT.net>
cc: 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 09:29:32 MDT."
             <199606071529.JAA29241@rocky.sri.MT.net> 
Date: Fri, 07 Jun 1996 16:00:23 -0700
Message-ID: <16852.834188423@time.cdrom.com>
From: "Jordan K. Hubbard" <jkh@time.cdrom.com>
Sender: owner-hackers@freebsd.org
X-Loop: FreeBSD.org
Precedence: bulk

> doing a *ton* of work in both -stable and -current.  However, it's a
> *LOT* of work.  However, I don't think this has anything to do with CVS,
> but has to do with the diverging of the trees.  P3 may make it easier to
> do as far as resources, but the actual work of 'merging' in changes to
> both won't be any easier.  Building the patches is the hard work IMHO,

I think you're forgetting the problem with cvs where:

1. You make a change in -release.
2. You merge it into -stable.
3. You make another change in -release.
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!

					Jordan