Re: [gentoo-portage-dev] [PATCH v2 2/2] Add an emaint module that can scan for failed merges and that can fix failed merges.

[Pavel Kazakov]

On 04/11/2014 04:03 PM, Brian Dolbec wrote:
> On Fri, 11 Apr 2014 15:05:09 -0700
> Pavel Kazakov <nullishzero@g.o> wrote:
>
>> On 03/31/2014 12:00 AM, Alexander Berntsen wrote:
>>> On 31/03/14 04:06, Brian Dolbec wrote:
>>>> It all looked really good to me. {:-D
>>> Yep.
>>>
>>> Please update the commit messages to follow DEVELOPING though.
>>>
>>
>> Sure. How are the following updates?
>>
>> For the first patch, I'll remove the second message line so the
>> message is only:
>> Move -MERGING- string to a constant
>>
>>
>
> No, there is never suppose to be more than a blank line for the second
> line.  Then for lines 3+  fill your boots :)
>
> the idea is to have one short descriptive line, followed by a blank
> line, then as many detail lines as needed.
>
> So, in this case dropping out the whitespace changes is minor, but
> still relevant.  so it should be kept on line 3.
>
>
>> For the second patch, I'll update the message to:
>> Add emaint module that handles failed merges
>>
>> The emaint module can scan for failed merges and fix any failed merges
>> found. The emaint module also keeps track of failed merges using a
>> tracking file.
>>
>> Regards,
>> Pavel
>>
>
> I was thinking more along the lines of:
>
> New emaint module: Merges
>
> This emaint module scans for failed package merges and will display
> or fix any failed packages found.
> This module also saves failed merges found using a tracking file.
> Subsequent runs of the module will re-load that info for re-display,
> re-emerge of those packages.
>
>

Both suggestions look good to me. Should I update the commit messages,
merge to master, and push?

Regards,
Pavel