Making your branches smaller for easier merges

[Andrew Pinski]

> 
> On 27/09/06, Diego Novillo <dnovillo@redhat.com> wrote:
> > Manuel López-Ibáñez wrote on 09/27/06 17:38:
> >
> > > Why? Perhaps I am entirely wrong but can't you just don't update (svn
> > > up) those directories that are switched until mainline is in an usable
> > > state?
> > >
> > If a pristine directory needs changes from the directory I branched, I'm
> > in trouble.
> >
> 
> Why? Sorry, I think I don't understand what you mean.

For an example, an extension is added to the C++ front-end and a change to the
libstdc++ library that now require this extension.  Now you have a mix match between
the library and the compiler as you are using a pristine libstdc++ from the mainline
but a branched C++ front-end.

-- Pinski
>