Marc-André Lureau writes:
> On Fri, Aug 25, 2017 at 2:57 PM Eduardo Habkost wrote:
>
>> On Fri, Aug 25, 2017 at 08:02:26AM +0200, Markus Armbruster wrote:
>> > Conflicts with Eduardo's "[PATCH v2] qapi: Fix error handling code on
>> > alternate
On Fri, Aug 25, 2017 at 2:57 PM Eduardo Habkost wrote:
> On Fri, Aug 25, 2017 at 08:02:26AM +0200, Markus Armbruster wrote:
> > Conflicts with Eduardo's "[PATCH v2] qapi: Fix error handling code on
> > alternate conflict".
> > Message-Id:
On Fri, Aug 25, 2017 at 08:02:26AM +0200, Markus Armbruster wrote:
> Conflicts with Eduardo's "[PATCH v2] qapi: Fix error handling code on
> alternate conflict".
> Message-Id: <20170717180926.14924-1-ehabk...@redhat.com>
>
> Marc-André, could you have a look? You can rebase your fix on top of
>
Conflicts with Eduardo's "[PATCH v2] qapi: Fix error handling code on
alternate conflict".
Message-Id: <20170717180926.14924-1-ehabk...@redhat.com>
Marc-André, could you have a look? You can rebase your fix on top of
Eduardo's, or merge the two into one commit.
Marc-André Lureau
Marc-André Lureau writes:
> Hi
>
> - Original Message -
>> Marc-André Lureau writes:
>>
>> > The type_seen member can be of a different type than the 'qtype' being
>> > checked, since a string create several conflicts. Lookup
Hi
- Original Message -
> Marc-André Lureau writes:
>
> > The type_seen member can be of a different type than the 'qtype' being
> > checked, since a string create several conflicts. Lookup the real
> > conflicting type in the conflict set, that one must be
Marc-André Lureau writes:
> The type_seen member can be of a different type than the 'qtype' being
> checked, since a string create several conflicts. Lookup the real
> conflicting type in the conflict set, that one must be present in
> type_seen.
>
> This fixes the
The type_seen member can be of a different type than the 'qtype' being
checked, since a string create several conflicts. Lookup the real
conflicting type in the conflict set, that one must be present in
type_seen.
This fixes the following error, reproducible with the modified test:
Traceback