Re: Making your branches smaller for easier merges

2006-09-27 Thread Manuel López-Ibáñez
On 28/09/06, Andrew Pinski <[EMAIL PROTECTED]> wrote: > > > 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

Re: Making your branches smaller for easier merges

2006-09-27 Thread Andrew Pinski
> > > 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 fol

Re: Making your branches smaller for easier merges

2006-09-27 Thread Manuel López-Ibáñez
On 27/09/06, Andrew Pinski <[EMAIL PROTECTED]> wrote: > > On 27/09/06, Diego Novillo <[EMAIL PROTECTED]> 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 main

Re: Making your branches smaller for easier merges

2006-09-27 Thread Diego Novillo
Manuel López-Ibáñez wrote on 09/27/06 18:50: > On 27/09/06, Diego Novillo <[EMAIL PROTECTED]> wrote: >> Manuel López-Ibáñez wrote on 09/27/06 18:25: >>> On 27/09/06, Diego Novillo <[EMAIL PROTECTED]> wrote: >>> If a pristine directory needs changes from the directory I branched, I'm in

Re: Making your branches smaller for easier merges

2006-09-27 Thread Manuel López-Ibáñez
On 27/09/06, Diego Novillo <[EMAIL PROTECTED]> wrote: Manuel López-Ibáñez wrote on 09/27/06 18:25: > On 27/09/06, Diego Novillo <[EMAIL PROTECTED]> wrote: > >> If a pristine directory needs changes from the directory I branched, I'm >> in trouble. >> > > Why? Sorry, I think I don't understand wha

Re: Making your branches smaller for easier merges

2006-09-27 Thread Paul Brook
> 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? That's only feasible if you're the only person working on that branch, and you only ever use one checkout on one machine. I guess you could us

Re: Making your branches smaller for easier merges

2006-09-27 Thread Andrew Pinski
> > On 27/09/06, Diego Novillo <[EMAIL PROTECTED]> 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 pri

Re: Making your branches smaller for easier merges

2006-09-27 Thread Diego Novillo
Manuel López-Ibáñez wrote on 09/27/06 18:25: > On 27/09/06, Diego Novillo <[EMAIL PROTECTED]> wrote: > >> 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. > Say I branch gcc/gcc and keep all the run

Re: Making your branches smaller for easier merges

2006-09-27 Thread Manuel López-Ibáñez
On 27/09/06, Diego Novillo <[EMAIL PROTECTED]> 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 fro

Re: Making your branches smaller for easier merges

2006-09-27 Thread Diego Novillo
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.

Re: Making your branches smaller for easier merges

2006-09-27 Thread Manuel López-Ibáñez
On 27/09/06, Daniel Berlin <[EMAIL PROTECTED]> wrote: On 9/27/06, Diego Novillo <[EMAIL PROTECTED]> wrote: > Daniel Berlin wrote on 09/27/06 16:37: > > > If you are just writing a new pass, you can probably get away with > > branching only a few files, and switching those may be a lot better > >

Re: Making your branches smaller for easier merges

2006-09-27 Thread Paul Brook
On Wednesday 27 September 2006 21:37, Daniel Berlin wrote: > I see occasional complaints about the size of mainline merges to > branches Most people working on branches are only modifying a very > small subset of the files that are in mainline, and certainly not the > entire trunk tree. I'm kinda

Re: Making your branches smaller for easier merges

2006-09-27 Thread Daniel Berlin
On 9/27/06, Diego Novillo <[EMAIL PROTECTED]> wrote: Daniel Berlin wrote on 09/27/06 16:37: > If you are just writing a new pass, you can probably get away with > branching only a few files, and switching those may be a lot better > strategy than branching the entire trunk tree branch to modify

Re: Making your branches smaller for easier merges

2006-09-27 Thread Diego Novillo
Daniel Berlin wrote on 09/27/06 16:37: > If you are just writing a new pass, you can probably get away with > branching only a few files, and switching those may be a lot better > strategy than branching the entire trunk tree branch to modify 6 files > in the gcc dir. > But this means that I'm at

Making your branches smaller for easier merges

2006-09-27 Thread Daniel Berlin
I see occasional complaints about the size of mainline merges to branches Most people working on branches are only modifying a very small subset of the files that are in mainline, and certainly not the entire trunk tree. You guys should be aware that you can simply branch those files you want (o