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

Graeme Geldenhuys graemeg at opensoft.homeip.net
Tue Aug 25 12:57:16 CEST 2009

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. :-)

  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) 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.

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.

  - Graeme -

fpGUI Toolkit - a cross-platform GUI toolkit using Free Pascal

More information about the fpc-devel mailing list