[m-rev.] for review: fix bug #183

[Julien Fischer]

On Wed, 22 May 2013, Peter Wang wrote:

> On Wed, 22 May 2013 16:57:57 +1000 (EST), Julien Fischer <jfischer at opturion.com> wrote:
>>
>> On Wed, 22 May 2013, Peter Wang wrote:
>>
>>> On Wed, 22 May 2013 15:28:56 +1000 (EST), Julien Fischer <jfischer at opturion.com> wrote:
>>>>
>>>> Done, diff follows.
>>>
>>> Does this not belong on 13.05?
>>
>> Yes, it probably should have gone onto that branch.
>
> Ok.
>
> Can we agree to commit fixes to the 13.05 branch,

That's what I've been doing.  In this case, I simply forgot what branch
my workspace was on and neglected to check.

> and defer merges so we get fewer of them?

Given that the rotds are taken off the master branch, aren't you simply
go to defer bug-fixes going into the rotds by doing that?

> If you're about to commit an intrusive change on
> master that would make merging 13.05 non-trivial after the change, then
> go ahead and merge first.
>
> I'm tempted to rewrite 'master' and make it neat :)

You worry too much about that.  It would be a good idea if the policies
regarding branches and how they are managed were written down somewhere.
Any volunteers?

On sort of related note, the conversion to git has meant that there
are loads of useless branches and tags in the github project.  Can we
delete these?

Cheers,
Julien.