[fpc-other] Fork

[Graeme Geldenhuys]

2010/10/23 Adem <listmember at letterboxes.org>:
> work, use git to ingrate that fix/feature after every update.
> This way, you will have micro-forked FPC (or Lazarus or whatever) but it is

This works very well indeed. I have +- 15 such feature branches for
Lazarus IDE alone, and it takes all of 1 minute to rebase and merge
them into my own work branch - after a update.


> Now, if only Graeme wrote up a comprehensive (and comprehensible) howto for
> doing that :)

I think I've done this a few times, but here goes again.


$ git checkout master
$ git pull github master

The 'master' branch is the branch on github that tracks the SubVersion
trunk branch.

$ git checkout feature1
$ git rebase master

$ git checkout feature2
$ git rebase master

'feature1' and 'feature2' are branches that implement the features I
need, and that are not included in Lazarus or FPC svn repositories.
The rebase command resets that branch to be identical to 'master',
then replays the commits on top of that. This makes the repository
history linear, and looks as if I implemented those features on top of
the latest commit in 'master'.

$ git checkout master
$ git checkout -b work

Start from the 'master' branch, then create a 'work' branch off of
'master'. I'll use the 'work' branch to apply/merge all my features I
want. This will be the branch I use on a day to day usage.

$ git merge feature1 feature2

This now merges the 'feature1' and 'feature2' branches with the
current 'work' branch. Now simply recompile FPC or Lazarus using this
'work' branch. It will then contain the local features you want,
without having to bother the FPC or Lazarus team members.


When it's time to sync with subversion, by pulling new updates from
github, simple redo the process above. You can even place all these
commands in a script or batch file to speed things up even more.


-- 
Regards,
  - Graeme -


_______________________________________________
fpGUI - a cross-platform Free Pascal GUI toolkit
http://opensoft.homeip.net:8080/fpgui/