On 04/11/2009, Vincent Snijders <vsnijd...@vodafonevast.nl> wrote: > > On #lazarus-ide, IRC, somebody said that the fixes_0_9_28 branch was out of > sync, is that still true?
No. The sync (for fixes branch) is not a automated process, but I try and update it once a week (normally Mondays). If somebody urgently needs a fix they can contact me directly or simply cherry-pick the patch they need from "upstream" to there local "fixes" branch. As of 15 minutes ago, the "fixes 0.9.28" branch in Git is synced with SubVersion fixes branch. PS: Please note this "manual sync" process in ONLY for the "fixes" branch. Trunk in SubVersion is automatically synced every 15 minutes with Git's "upstream" branch. Reason for "manual sync" of fixes branch: ----------------------------------------- Now for the long answer... :-) * SubVersion does not distinguish between tags and branches. * SubVersion does not keep a good history of when branches are started and from what commit they started (I think this is fixed in latest SubVersion) * Git's svn support is not perfect. So based on the above points I decided to manually sync the "fixes" branch. If I automate the "fixes" sync, then the Git repository grows much bigger than needed because (I think) it actually duplicates patches (commits) for the branch and not reuse them. So I simply get a changelog from my previous sync to current revision in fixes branch. I then cherry-pick those revisions into "fixes". This does not increase the Git repository at all because it reuses the original patch (commit). And yes, I do allow for custom changes in fixes branch, which were not merges (like changing the revision number for a release). -- Regards, - Graeme - _______________________________________________ fpGUI - a cross-platform Free Pascal GUI toolkit http://opensoft.homeip.net/fpgui/ -- _______________________________________________ Lazarus mailing list Lazarus@lists.lazarus.freepascal.org http://lists.lazarus.freepascal.org/mailman/listinfo/lazarus