[Top][All Lists]

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: [Monotone-devel] automate show_conflict

From: Stephen Leake
Subject: Re: [Monotone-devel] automate show_conflict
Date: Tue, 15 Apr 2008 10:51:38 -0400
User-agent: Gnus/5.1008 (Gnus v5.10.8) Emacs/22.1 (windows-nt)

Thomas Keller <address@hidden> writes:

> Stephen Leake schrieb:
>> I've created the branch n.v.m.automate_show_conflict, added the
>> 'automate show_conflict', and a test tests/automate_show_conflicts.
>> In an earlier thread, we talked about adding --merge and --update
>> options to this command, to aid in picking which revisions to report
>> conflicts for. I haven't done that yet.
>> So far it outputs the "file added on left and right" case properly.
>> I'll work thru all the cases in tests/conflict_messages.

This is now complete; 'mtn automate show_conflicts' outputs basic_io
for all conflict cases.

So I think the branch n.v.m.automate_show_conflict is ready to be
merged to main. Someone may want to review it first. And I have to
review the automate version number; there's been a release since I
checked it.

-- Stephe

reply via email to

[Prev in Thread] Current Thread [Next in Thread]