[fpc-devel] handling of 2.3.x (new 2.4) branch

[Florian Klaempfl]

Graeme Geldenhuys schrieb:
> Vincent Snijders wrote:
>> But still allows patches directly committed to the fixes_2.4 branch?
> 
> Yes, I will detect those and apply accordingly. This is why I asked how
> the "fixes" branch is _normally_ handled. If svnmerge is used - it is
> simply less effort for me. :-)
> 
> Sidebar:
>   The reason I use cherry-pick is because it gives a more optimised
> repository, and results in less to clone/pull. I could use the usual
> 'git svn' to manage the branch, but then git doesn't know that it was
> actually merges from trunk (via svnmerge) 

For fixes_2_4 we use the native merge facilities of subversiob 1.5+

> and it acts as if it was
> normal development commits (no relation to other development branches).
> Cherry-pick keeps the relationship between branches - including the
> original commit author etc. More work for me (until I can figure out how
> to automate this), but I prefer it this way.

Problem is that often merges are no real merges because the patches
don't apply and need manual editing.

> 
> 
> I'm now using fixes_2.4 as our default FPC compiler at work. Two benefits:
>  * I help test the FPC 2.4 before it gets released
>  * Fixes 2.4 branch is guaranteed to be in sync with SubVersion.
> 
> 
> Regards,
>   - Graeme -
>