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: pinskia at physics dot uc dot edu (Andrew Pinski), 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 19:06:13 -0400 (EDT)
- Subject: Re: Making your branches smaller for easier merges
>
>
> Sorry, I still don't see where is the problem. You either want the
> extension in your branch, so you merge it and simply update libstdc++,
> or you don't want the extension just yet, so you just don't update
> libstdc++ (or update back to your previous revision).
That means you have to follow what is going on the mainline closer than
you would if you just branched the whole sources. Yes changes like this
has happened for 4.2.0 even. Since you branched the GCC directory for
non front-end changes like say a new opimization, you don't want to follow
what is happening on the C++ front-end side that closely .Also you don't know
if it was too late to update until you actually did it.
-- Pinski