[PATCH 3 of 7] histedit-test: clarify the reason of a failure

Augie Fackler raf at durin42.com
Mon Oct 1 14:06:06 CDT 2012


When I say queued, I mean at
http://hg.durin42.com/augie/mercurial/for-mpm so mpm or someone from
crew can pull (draft phase).

On Mon, Oct 1, 2012 at 1:20 PM, Augie Fackler <raf at durin42.com> wrote:
> Queued 2 and 3, thanks
>
> On Sep 27, 2012, at 6:07 PM, Pierre-Yves David <pierre-yves.david at ens-lyon.org> wrote:
>
>> # HG changeset patch
>> # User Pierre-Yves David <pierre-yves.david at ens-lyon.org>
>> # Date 1348703608 -7200
>> # Node ID b7ecc3e190f5d9488ab15861d99f8d53bf56b30c
>> # Parent  e727a3670f4d125c9b61f3fb2d45ff2d7545c75b
>> histedit-test: clarify the reason of a failure
>>
>> There is multiple conflict during this test. This add a small comment that
>> highligh the reason of a particular failure.
>>
>> diff --git a/tests/test-histedit-non-commute.t b/tests/test-histedit-non-commute.t
>> --- a/tests/test-histedit-non-commute.t
>> +++ b/tests/test-histedit-non-commute.t
>> @@ -162,6 +162,9 @@
>>   merging e incomplete! (edit conflicts, then use 'hg resolve --mark')
>>   abort: Fix up the change and run hg histedit --continue
>>
>> +This failure is caused by 7b4e2f4b7bcd "e" not rebasing the non commutative
>> +former children.
>> +
>> just continue this time
>>   $ hg revert -r 'p1()' e
>>   $ hg resolve --mark e
>


More information about the Mercurial-devel mailing list