> > 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.
I have multiple trees and they usually do not rely on each other. For small/important bugs, I work on the main tree and try to get it accepted sooner. > > 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. Taking the example of my embedding tree. It has several parts: read/write zip file, track embedded files, how insets handle embedded files. When it is time to submit for review, I would 'svn diff src/Buffer.h src/Buffer.cpp' for the read/write part, apply to the main tree, make it compile and generate a patch for review. After it is accepted, 'svn up' the embedding tree, and generate the next patch. This will take some time, but going through my big patch again help me improve the style and comments, and sometimes lead to partial rewrites. Cheers, Bo
