[haiku-development] Re: merge branch

On 2010-05-14 at 04:39:45 [+0200], Ryan Leavengood <leavengood@xxxxxxxxx> 
wrote:
> On Thu, May 13, 2010 at 9:56 PM, Clemens Zeidler
> <clemens.zeidler@xxxxxxxxxxxxxx> wrote:
> >
> > Haven't known that svn is such a pain, or did I do something wrong?
> 
> SVN branches are a huge pain, especially for a big project like Haiku.
> I pretty much refuse to use them if I can avoid it. Git is much better
> for branching, and Mercurial I think as well, though I don't have much
> experience with it.
> 
> To solve this particular problem I think you should create a new
> branch, but only of the app_server directory. You could then check
> that out separately, symlink it into your normal Haiku tree under
> src/servers as app_server_stack_and_tile, and then locally modify you
> src/servers/Jamfile to recurse into app_server_stack_and_tile instead
> of the normal app_server.

You can "svn switch" individual directories. No need for the symlink + 
Jamfile action.

Unfortunately it can easily get annoying to branch individual directories, 
even when one works only on a single component. E.g. in case of the app 
server, due to the split headers-source layout of our repository, you'll 
likely already start with two directories (src/servers/app and 
headers/private/app). If it turns out that you'll also need to change 
details client-side, you'll probably have to add src/kits/{app,interface} 
and header/private/interface, maybe even headers/os/{app,interface}. 
Changes to private shared classes could easily drag a whole bunch of other 
directories into the mix.

So my recommendation is to rather branch the whole trunk. The downside is 
that all trunk changes will have to be merged into the branch from time to 
time, or you'll have to do a monster merge eventually (with all the 
cumulated conflicts). Other than that it will be significantly simpler than 
the piece-meal handling of individually branched directories, though.

CU, Ingo

Other related posts: