This is the mail archive of the
gcc-patches@gcc.gnu.org
mailing list for the GCC project.
Re: Making your branches smaller for easier merges
- From: Andrew Pinski <pinskia at physics dot uc dot edu>
- To: lopezibanez at gmail dot com (Manuel LÃpez-IbÃÃez)
- Cc: dnovillo at redhat dot com (Diego Novillo), dberlin at dberlin dot org (Daniel Berlin), gcc-patches at gcc dot gnu dot org (gcc-patches), gcc at gcc dot gnu dot org
- Date: Wed, 27 Sep 2006 18:43:22 -0400 (EDT)
- Subject: Re: Making your branches smaller for easier merges
>
> 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
>