On Fri, Sep 16, 2005 at 03:49:12PM -0400, Joshua Slive wrote: > > Sander Striker wrote: > > >The latter should never happen. Develop on trunk, merge back to > >stable: 2.2 branch, or 2.2 branch and 2.0 branch. > > > >At least, that's what I envisioned after all the discussion on how > >to move on with the branch/versioning scheme. > > The problem is that doing a typo fix in the docs can wind up taking me a > good half-hour in this model. So I just don't do it much anymore.
FWIW, I use: http://people.apache.org/~jorton/svn.merge which makes the merge process less painful. $ svn ci -m "some fix" ... Committed revision 123456. $ cd ../httpd-2.2.x $ svn.merge 123456 ... $ svn ci -F clog joe
