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. -- To unsubscribe from this list: send the line "unsubscribe kvm" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html