[Lazarus] Release schedule and policy

Joost van der Sluis joost at cnoc.nl
Wed Oct 27 14:00:15 CEST 2010


On Mon, 2010-10-25 at 08:43 +0200, Graeme Geldenhuys wrote:
> Op 2010-10-22 20:19, Michael Van Canneyt het geskryf:
> > I don't want to start searching for branches that contain new things, and 
> > what if 2 features I want to test are in different branches ?
> 
> $ git checkout -b work
> $ git merge feature1 feature2

This is exactly where my git-nightmares are coming from.

> :-)
> 
> 'work' is the branch you want with whatever features you need. 'feature1'
> and 'feature2' are the branches with new (large'ish) features. I've been
> working like this using the git mirror for almost a year now. No problems,
> and it's really quick to update or reset (sync to trunk) the work branch.

Well, as you're such a bug Git fan. And you want a better
debugging-environment....

Just checkout the archer/gdb project, you can find it at:

git://sourceware.org/git/archer.git

Now you only have to search for all the pascal-related fixes splattered
all over the place in all the feature-branches. Just do:

git merge feature1 feature2 feature3 ...

Well, you have to look up the names of all these feature-branches,
offcourse. And you'll notice they won't merge that easily... 

But you can create a much better gdb-environment that way. 

Oh, and ... good luck!

Joost.







More information about the Lazarus mailing list