Richard Heck wrote:
Bo Peng wrote:
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.
That is part of the reason why I do not use branches. I simply work
locally, and keep my tree up to date using 'svn up'.
Yes, though, if fixing a bug modifies a file I'm working on otherwise,
then I can have a problem.
When a feature is ready, I will generate a big patch for review. If
the patch is too
big, I am willing to split it by functionally separated parts.
It's how to do this last bit that I'm curious about.
When this is about implementing a new feature, this is often easy. From
what I see in your branch, there is a lot of code shuffling and cleanup.
I am sorry to say that splitting your big patch in smaller patches will
not be possible. You will have to reimplement each and every change you
did gradually.
Abdel.
