Re: Branches [was: One BufferView per Buffer]

[Abdelrazak Younes]

Richard Heck wrote:
[EMAIL PROTECTED] wrote:
I can commit that part right now indeed. But it _is_ related because 
I heavily modified the way Buffer are loaded from the GUI.
It's related, but I think the point is that it'd been easier to 
discuss/review this mechanism separately - as a separate chunk.
Since I've been doing some work in a branch, as well, I'd appreciate 
some advice on how to deal with it once it's to the point where I'm 
ready to seek a merge. I chose to work in a branch because I knew I'd be 
modifying so many files that it'd make ordinary bug-fixing in the same 
branch complicated, even with some scripts I've developed for my own 
use. And so when that development is done, there will be a lot of 
changes, including some that are more or less cosmetic, because making 
them along the way helped me to understand what I was doing.

Now I suppose it'd be possible to split the ultimate product into a 
series of patches, but this does look complicated to me, and I'm not 
even really sure how to approach doing it.

Right now, if I may summarize the opinion of the lead developers: you 
will have to rebase all your work on trunk step by step, logical change 
by logical change. It's obviously a waste of time and most of the time 
invested in your branch is basically lost. I will discourage anyone 
trying to work in branch.

Abdel.