[fpc-devel] Parallel processing in the compiler
Juha Manninen (gmail)
juha.manninen62 at gmail.com
Sun Sep 5 14:17:17 CEST 2010
On Sunday 05 September 2010 13:29:38 Graeme Geldenhuys wrote:
> Reading Jonas's comments and your reply above, it seems a git mirror
> (or a subversion/git dual setup) would be much better suited for your
> working style. git allows local commits and local branches. Ideal for
> cases like "so those changes don't get lost" or braking a large set of
> changes into smaller commits.
I can recommend it, too.
In some earlier mail I mentioned it would solve DoDi's problems with merging
his branch with trunk after they have deviated much from each other.
Having your local git branch active, just run :
$ git rebase master
(assuming master branch is trunk)
I just recently created a git branch from my old Lazarus Build Profiles patch.
It took some effort to solve all conflicts but now I am confident I can keep it
in sync with trunk easily by running "git rebase master" once a week or so.
It is good in case the feature is accepted for Lazarus in future (during next
5 year plan maybe).
Git seems to be a good tool for such things and it integrates well with SVN.
Everybody should be happy. :-)
More information about the fpc-devel