Date: Fri, 07 Jun 1996 16:00:23 -0700 From: "Jordan K. Hubbard" <jkh@time.cdrom.com> 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 Message-ID: <16852.834188423@time.cdrom.com> In-Reply-To: Your message of "Fri, 07 Jun 1996 09:29:32 MDT." <199606071529.JAA29241@rocky.sri.MT.net>
next in thread | previous in thread | raw e-mail | index | archive | help
> 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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?16852.834188423>