From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from eggs.gnu.org ([2001:4830:134:3::10]:51431)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <xiawenc@linux.vnet.ibm.com>) id 1WE8oV-0006X2-P0
	for qemu-devel@nongnu.org; Thu, 13 Feb 2014 21:47:48 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <xiawenc@linux.vnet.ibm.com>) id 1WE8oM-0005FC-J5
	for qemu-devel@nongnu.org; Thu, 13 Feb 2014 21:47:39 -0500
Received: from e28smtp03.in.ibm.com ([122.248.162.3]:60823)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <xiawenc@linux.vnet.ibm.com>) id 1WE8oL-0005DM-UF
	for qemu-devel@nongnu.org; Thu, 13 Feb 2014 21:47:30 -0500
Received: from /spool/local
	by e28smtp03.in.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use
	Only! Violators will be prosecuted
	for <qemu-devel@nongnu.org> from <xiawenc@linux.vnet.ibm.com>;
	Fri, 14 Feb 2014 08:17:27 +0530
Received: from d28relay05.in.ibm.com (d28relay05.in.ibm.com [9.184.220.62])
	by d28dlp01.in.ibm.com (Postfix) with ESMTP id BB729E0053
	for <qemu-devel@nongnu.org>; Fri, 14 Feb 2014 08:20:45 +0530 (IST)
Received: from d28av03.in.ibm.com (d28av03.in.ibm.com [9.184.220.65])
	by d28relay05.in.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id
	s1E2lQJW10092802
	for <qemu-devel@nongnu.org>; Fri, 14 Feb 2014 08:17:26 +0530
Received: from d28av03.in.ibm.com (localhost [127.0.0.1])
	by d28av03.in.ibm.com (8.14.4/8.14.4/NCO v10.0 AVout) with ESMTP id
	s1E2lNsq023585
	for <qemu-devel@nongnu.org>; Fri, 14 Feb 2014 08:17:24 +0530
Message-ID: <52FD83CB.3080203@linux.vnet.ibm.com>
Date: Fri, 14 Feb 2014 10:47:39 +0800
From: Wenchao Xia <xiawenc@linux.vnet.ibm.com>
MIME-Version: 1.0
References: <1392068921-3327-1-git-send-email-xiawenc@linux.vnet.ibm.com>
	<1392068921-3327-10-git-send-email-xiawenc@linux.vnet.ibm.com>
	<877g8zvzbp.fsf@blackfin.pond.sub.org>
	<20140213101124.1d8ed0c0@redhat.com>
In-Reply-To: <20140213101124.1d8ed0c0@redhat.com>
Content-Type: text/plain; charset=UTF-8; format=flowed
Content-Transfer-Encoding: 8bit
Subject: Re: [Qemu-devel] [PATCH V6 09/10] tests: add cases for inherited
 struct and union with discriminator
List-Id: <qemu-devel.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: Luiz Capitulino <lcapitulino@redhat.com>, Markus Armbruster <armbru@redhat.com>
Cc: kwolf@redhat.com, qemu-devel@nongnu.org, mdroth@linux.vnet.ibm.com

于 2014/2/13 23:11, Luiz Capitulino 写道:
> On Thu, 13 Feb 2014 15:53:30 +0100
> Markus Armbruster <armbru@redhat.com> wrote:
>
>> Wenchao Xia <xiawenc@linux.vnet.ibm.com> writes:
>>
>>> Test for inherit and complex union.
>>
>> This patch conflicts badly with my test coverage work in "[PATCH v2
>> 00/13] qapi: Test coverage & clean up generated code".  My series
>> systematically covers code generation in scripts/qapi*py, and that takes
>> me seven patches.
>>
>> If I put your patch first, mine all explode, and I get to start over.
>>
>> Putting my series first looks far easier to resolve, because only this
>> one patch conflicts.  Would you mind me rebasing your series on top of
>> mine?
>
> If it's only this patch that causes conflicts, what about the
> following:
>
>   1. I apply patches 1-8 plus patch 10
>   2. Markus rebases patch 9 and adds it to his series
>   3. Markus post a new version
>
> Does this work for everyone?
>
> The only drawback is that both series will miss today's boat, but this
> would happen at this point anyway.
>
   I am fine with it.