[op5-users] My Merlin patches at github

[Andreas Ericsson]

On 11/24/2009 04:54 PM, Sean Millichamp wrote:
> On Tue, 2009-11-24 at 16:38 +0100, Andreas Ericsson wrote:
> 
>> Yes, but they're not included in the 'master' branch for now. Only in
>> the 'next' branch, which is where I collect patches to be incorporated
>> in the next op5 Monitor release.
> 
> Ah, great!  I hadn't payed any attention to the next branch, just
> master.  If I am hacking on merlin is "next" generally the best branch
> for me to be testing against and basing any patches on?
> 

That depends. Preferrably, a series of patches should apply cleanly to
master, unless they depend on a series of patches already in next.
That way, I can build a "proposed updates" branch of all the different
topics and then ask people to test that. Things that are in 'next' are
more or less guaranteed to go into merlin in some form or other sooner
or later, but creating patches off of it means I may have to do a lot
of manual work if they depend on something unrelated.

>> Tomorrow afternoon is Merlin day though. I'll review the patches
>> individually and apply the ones I feel are 100% safe.
>>
>> Backlog support will be included in next release though, so I'll go
>> over those patches more thoroughly.
> 
> Great!  I'm looking forward to any feedback (good and bad!) as I don't
> do a lot of programming (particularly C) and a number of the merlin
> design related issues I was taking educated guesses on.
> 

Well, it passed test one (compilation) and seems to run just fine for
local use only. The patches were also nicely isolated so you're doing
a great job so far :)

I'll have more information tomorrow. Cheers

-- 
Andreas Ericsson                   andreas.ericsson at op5.se
OP5 AB                             www.op5.se
Tel: +46 8-230225                  Fax: +46 8-230231

Considering the successes of the wars on alcohol, poverty, drugs and
terror, I think we should give some serious thought to declaring war
on peace.