Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 14 Oct 1997 12:44:06 +0000 (GMT)
From:      Terry Lambert <tlambert@primenet.com>
To:        kpneal@pobox.com (Kevin P. Neal)
Cc:        freebsd-hackers@FreeBSD.ORG
Subject:   Re: Large scale code integrations (Was: Re: C2 Trusted
Message-ID:  <199710141244.FAA01733@usr02.primenet.com>
In-Reply-To: <1.5.4.32.19971014050321.006e0640@mindspring.com> from "Kevin P. Neal" at Oct 14, 97 01:03:21 am

next in thread | previous in thread | raw e-mail | index | archive | help
> >I don't know if this sort of thing is typical for large changes in
> >general, but it does worry me when contemplating them.  There just
> >seem to be things which can not really be broken up, yet still need
> >doing. :\  What is the proper way to go about these, and still have
> >something that can be integrated?
> 
> A branch for the changes to go on, and move them over when they are
> fully baked?
> 
> Oh joy, more branches. :/

A branch would be one way.  It wouldn't let you fix the glaring code
layout problems, unfortunately, like config not being built as
necessary for kernel configuration changes, or seperation of bus code
from architecture code to aid in porting to multiple platforms, etc..

So branch tags are not a panacea; but they'd fix this case...  There
are still "merge" issues with history files, however.  8-(.


					Terry Lambert
					terry@lambert.org
---
Any opinions in this posting are my own and not those of my present
or previous employers.



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?199710141244.FAA01733>