[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: |
Thu, 17 Apr 2008 05:30:09 -0400 |
User-agent: |
Gnus/5.1008 (Gnus v5.10.8) Emacs/22.1 (windows-nt) |
Stephen Leake <address@hidden> writes:
> Thomas Keller <address@hidden> writes:
>
>> Stephen Leake schrieb:
>>> 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.
>>
>> The diff of nvm against nvm.automate_show_conflict is quite huge
>> (>25.000 lines). It seems that nvm.automate_show_conflict doesn't
>> contain all the recent changes in nvm. Could you therefor please
>> propagate from nvm to your branch first and resubmit your request?
>
> Good point.
>
> Doing that required some code fixes to deal with the hexenc changes,
> and now some tests are failing. So I have more work to do.
Ok, everything is merged, fixed, and pushed; ready for review.
--
-- Stephe
- Re: [Monotone-devel] automate show_conflict, Stephen Leake, 2008/04/15
- Re: [Monotone-devel] automate show_conflict, Thomas Keller, 2008/04/15
- Re: [Monotone-devel] automate show_conflict, Richard Levitte, 2008/04/15
- Re: [Monotone-devel] automate show_conflict, Stephen Leake, 2008/04/17
- Re: [Monotone-devel] automate show_conflict, Stephen Leake, 2008/04/18
- Re: [Monotone-devel] automate show_conflict, Thomas Keller, 2008/04/18
- Re: [Monotone-devel] automate show_conflict, Stephen Leake, 2008/04/19
- Re: [Monotone-devel] automate show_conflict, Thomas Keller, 2008/04/19
- Re: [Monotone-devel] automate show_conflict, Stephen Leake, 2008/04/19
- Re: [Monotone-devel] automate show_conflict, Thomas Keller, 2008/04/19
- Message not available
- Message not available
- Re: [Monotone-devel] automate show_conflict, Stephen Leake, 2008/04/20