[Monotone-devel] improving show_conflicts

[Stephen Leake]

Markus Schiltknecht <address@hidden> writes:

> Stephen Leake wrote:
>
>> By "automate merge" I meant that mtn would "prompt" the GUI for help
>> when it got to a conflict. But I don't think the automate stdio
>> interface supports interaction like that, so I guess I really mean we
>> need a way to do all the steps that "merge" currently does via
>> automate stdio. That capability may already be there; I'm not sure.
>> The first step would be "give me a list of all non-content
>> conflicts".
>> I don't see that in the automate commands yet. Adding that might
>> actually be easier than adding --drop-merge-right to merge; I'll look
>> into it.
>
> I'd prefer such an approach a lot. And yes, the automate interface
> could certainly do more in that area. A "try this merge" command
> (which would return possible non-content conflicts as well as content
> conflicts) would be very nice, IMO.

It turns out there is such a command already; show_conflicts.

However, I'd like it to default to the two current heads as merge does. 

And I'd like an automate basic_io version of it, for use by Emacs DVC. 

I'll work on this.

-- 
-- Stephe