[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Monotone-devel] improving show_conflicts
From: |
Stephen Leake |
Subject: |
[Monotone-devel] improving show_conflicts |
Date: |
Tue, 19 Feb 2008 06:39:57 -0500 |
User-agent: |
Gnus/5.1006 (Gnus v5.10.6) Emacs/22.1 (windows-nt) |
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
- Re: [Monotone-devel] How to join identical branches?, (continued)
- Re: [Monotone-devel] How to join identical branches?, Stephen Leake, 2008/02/12
- [Monotone-devel] Re: How to join identical branches?, Koen Kooi, 2008/02/12
- Re: [Monotone-devel] How to join identical branches?, Nuno Lucas, 2008/02/12
- Re: [Monotone-devel] How to join identical branches?, Markus Schiltknecht, 2008/02/12
- Re: [Monotone-devel] How to join identical branches?, Stephen Leake, 2008/02/13
- Re: [Monotone-devel] How to join identical branches?, Markus Schiltknecht, 2008/02/13
- Re: [Monotone-devel] How to join identical branches?, Stephen Leake, 2008/02/13
- Re: [Monotone-devel] How to join identical branches?, Markus Schiltknecht, 2008/02/13
- Re: [Monotone-devel] How to join identical branches?, Stephen Leake, 2008/02/14
- Re: [Monotone-devel] How to join identical branches?, Markus Schiltknecht, 2008/02/14
- [Monotone-devel] improving show_conflicts,
Stephen Leake <=
- Re: [Monotone-devel] improving show_conflicts, Derek Scherger, 2008/02/20
- Re: [Monotone-devel] improving show_conflicts, Stephen Leake, 2008/02/20
- Re: [Monotone-devel] improving show_conflicts, Derek Scherger, 2008/02/20
- Re: [Monotone-devel] improving show_conflicts, Stephen Leake, 2008/02/21
- Re: [Monotone-devel] improving show_conflicts, Stephen Leake, 2008/02/21
- Re: [Monotone-devel] How to join identical branches?, William Uther, 2008/02/13
- Re: [Monotone-devel] How to join identical branches?, Stephen Leake, 2008/02/14
- Re: [Monotone-devel] How to join identical branches?, Derek Scherger, 2008/02/13
- Re: [Monotone-devel] How to join identical branches?, Derek Scherger, 2008/02/17
- Re: [Monotone-devel] How to join identical branches?, Stephen Leake, 2008/02/17