Re: [Monotone-devel] merge conflicts

[Stephen Leake]

Stephen Leake <address@hidden> writes:

> Thomas Keller <address@hidden> writes:
>
>> Am 12.12.09 08:56, schrieb Stephen Leake:
>>> On Fri, Dec 11, 2009 at 6:20 AM, Thomas Keller <address@hidden> wrote:
>>> 
>>>>> $ mtn automate show_conflicts -b your.branch LEFT RIGHT
>>>>>
>>>>> Unfortunately the show_conflicts command isn't very useful to use before
>>>>> you merge, because it might report f.e. content conflicts which the
>>>>> internal monotone line merger might be perfectly able to resolve on its 
>>>>> own.
>>> 
>>> This suggests an enhancement option: '--no-resolved-internal', to
>>> exclude such conflicts from the show_conflicts output.
>>> 
>>> That would require calling the internal merger to see if it succeeds,
>>> when listing the conflicts. That's not hard.
>>
>> Hi Stephe!
>>
>> If you're up for that job, then great, just go ahead! 
>
> Well, I was mostly pointing out that someone who wants it could do it :).

Actually, it's even easier than I thought; 'automate show_conflicts'
already does call the internal merger, and marks conflicts with a
resolution of 'resolved_internal'. So '--no-resolved-internal' is just
an output filter.

But my other arguments stand; if you are calling 'automate', you
should be prepared to do simple parsing and counting, so there's no
need for this option on the automate command. The non-automate
commands do reasonable things, except for the status returned to the
OS.

-- 
-- Stephe