From mboxrd@z Thu Jan  1 00:00:00 1970
From: Uri Lublin <uril@redhat.com>
Subject: Re: [git pull request] kvm-autotest: sync with upstream Autotest
 SVN
Date: Wed, 03 Jun 2009 20:50:56 +0300
Message-ID: <4A26B800.5050307@redhat.com>
References: <20090601204108.GL4223@blackpad>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii; format=flowed
Content-Transfer-Encoding: 7bit
Cc: kvm@vger.kernel.org, lmr@redhat.com
To: Eduardo Habkost <ehabkost@redhat.com>
Return-path: <kvm-owner@vger.kernel.org>
Received: from mx2.redhat.com ([66.187.237.31]:46315 "EHLO mx2.redhat.com"
	rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
	id S1751489AbZFCRu5 (ORCPT <rfc822;kvm@vger.kernel.org>);
	Wed, 3 Jun 2009 13:50:57 -0400
Received: from int-mx2.corp.redhat.com (int-mx2.corp.redhat.com [172.16.27.26])
	by mx2.redhat.com (8.13.8/8.13.8) with ESMTP id n53HoxDe026069
	for <kvm@vger.kernel.org>; Wed, 3 Jun 2009 13:50:59 -0400
In-Reply-To: <20090601204108.GL4223@blackpad>
Sender: kvm-owner@vger.kernel.org
List-ID: <kvm.vger.kernel.org>

On 06/01/2009 11:41 PM, Eduardo Habkost wrote:
> Now that kvm-autotest was included on upstream Autotest SVN
> repository[1], the following pull request is a proposal to sync
> kvm-autotest.git Autotest SVN trunk, while keeping the kvm-autotest.git
> history.
>
> I have set up a git-svn mirror of the Autotest SVN repository[2], and
> the upstream Autotest changes included on this pull request come from
> this mirror.
>
> The changes available on my branch do the following, to try to make the
> resulting history bisectable:
>
> 1. Apply some trivial changes to avoid conflicts when merging with
>     Autotest SVN
> 2. Merge with Autotest SVN revision 3185 (revision immediately before
>     kvm-autotest was included)
> 3. Apply a patch series from Lucas, that converts the kvm-autotest
>     code to the code that went to Autotest SVN, including a rename
>     of tests/kvm_runtest_2 to tests/kvm.
> 4. Merge with Autotest SVN trunk (revision 3189)
>
>
> The result is a tree that is almost the same that is on upstream
> Autotest SVN, except for a few differences that need to be either
> removed from kvm-autotest, or sent upstream. The remaining differences
> are the following:
>
> $ git diff origin/master github/to-kvm-autotest-merge1 | diffstat
>   KVM_REGRESSION_README   |    4 ++
>   bin/base_sysinfo.py     |    2 -
>   bin/simple_ssh.py       |   70 ++++++++++++++++++++++++++++++++++++++++++++++++
>   tests/dbench/control.60 |   20 +++++++++++++
>   4 files changed, 95 insertions(+), 1 deletion(-)
>
> ('origin' is Autotest SVN, 'github' is the tree where the merge results
> are available)
>
>
> References:
>
>   [1] http://autotest.kernel.org/changeset/3187
>   [2] http://github.com/ehabkost/autotest/tree/master
>       The mirror is synchronized every 30 minutes.
>
> ----
> The following changes since commit 2a0a76645f72dcbd495ea37b566d017796eca24e:
>    Uri Lublin (1):
>          kvm_tests.cfg: adding some missing iso image md5sum values
>
> are available in the git repository at:
>
>    git://github.com/ehabkost/autotest.git to-kvm-autotest-merge1
>


Pulled, Thanks.