[Lazarus] test suite

Martin lazarus at mfriebe.de
Mon Mar 8 10:57:25 CET 2010


Graeme Geldenhuys schrieb:
> Florian Klaempfl het geskryf:
>> Replace rebase by merge and it works exactly the same with svn: you
> 
> As I mentioned, rebase works slightly different to merge. As you rebase
> against a newer revision, the patches in that branch cat change slightly
> due to change new changes in the newer revision. Rebase is as if you used
> the latest revision and quickly implemented a new feature on top of that
> latest revision.

I know how rebase works ;)

> 
> 
>> svn style. However I consider not merging a feature branch into trunk
>> but into a fixes branch as a rather chaotic development modell: trunk
>> should imo contain all working stuff.
> 
> Let me explain why. I implement a new feature in a feature branch. I submit
> that feature as a set of patches to Mantis. That patch set can sit in
> Mantis for months before it gets applied to Trunk.

Yes, this might apply to your local stuff, but not to an official
fixes/stable branch we talked about.




More information about the Lazarus mailing list