From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <alexey.borovskoy@gmail.com>
X-Spam-Checker-Version: SpamAssassin 3.2.5 (2008-06-10) on sa.int.altlinux.org
X-Spam-Level: 
X-Spam-Status: No, score=-1.8 required=5.0 tests=AWL,BAYES_00,SPF_PASS
	autolearn=ham version=3.2.5
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma;
	h=domainkey-signature:mime-version:sender:received:date
	:x-google-sender-auth:message-id:subject:from:to:content-type
	:content-transfer-encoding;
	bh=HHvkFiXrwmipzDbIm7l5Z4XwV+t/rY5K2iqAAWQc7AQ=;
	b=WGIctTMDlkg3/y6/6ghZEa2MvjRLP5p8pSJAj3bD8fYv/cMrVbhvgFjl9w7dQ4wC3f
	XfO+CRNJSGti4nwRc5aeu9s7TAAVXykK6ojwrG4OT+ijbJJlujmO4I/GYUTmzee2hx3n
	3YqZR0eAX/2By1H0h0Ft6lAR9hzOYJkq4bhBc=
DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma;
	h=mime-version:sender:date:x-google-sender-auth:message-id:subject
	:from:to:content-type:content-transfer-encoding;
	b=NJTNdqvsw6Vldsl6KNQheA3mDunocgOxlcgE6kG1DODPm7N7lH4y6D5DGmTQGrD/WF
	N1cts2qfTYT7zi0RrhYaMoxWe03P8sQkl1ERl1bkzymlZNX68Tks37JPBD+LvtgZlby3
	b/yXnnSfMdF9oiwkzkGGdKmJsfP7BatchuTFU=
MIME-Version: 1.0
Sender: alexey.borovskoy@gmail.com
Date: Mon, 18 Jan 2010 18:39:48 +1200
X-Google-Sender-Auth: 84ff5cfc85338418
Message-ID: <3f60a831001172239h2215059dyf39fb2f102cc6aca@mail.gmail.com>
From: Alexey Borovskoy <alb@altlinux.ru>
To: ALT Linux Team development discussions <devel@lists.altlinux.org>
Content-Type: text/plain; charset=KOI8-R
Content-Transfer-Encoding: quoted-printable
Subject: [devel] =?koi8-r?b?68HLIM/Czs/XydTYIGxpYnZpcnQ/?=
X-BeenThere: devel@lists.altlinux.org
X-Mailman-Version: 2.1.12
Precedence: list
Reply-To: ALT Linux Team development discussions <devel@lists.altlinux.org>
List-Id: ALT Linux Team development discussions <devel.lists.altlinux.org>
List-Unsubscribe: <https://lists.altlinux.org/mailman/options/devel>,
	<mailto:devel-request@lists.altlinux.org?subject=unsubscribe>
List-Archive: <http://lists.altlinux.org/pipermail/devel>
List-Post: <mailto:devel@lists.altlinux.org>
List-Help: <mailto:devel-request@lists.altlinux.org?subject=help>
List-Subscribe: <https://lists.altlinux.org/mailman/listinfo/devel>,
	<mailto:devel-request@lists.altlinux.org?subject=subscribe>
X-List-Received-Date: Mon, 18 Jan 2010 06:40:04 -0000
Archived-At: <http://lore.altlinux.org/devel/3f60a831001172239h2215059dyf39fb2f102cc6aca@mail.gmail.com/>
List-Archive: <http://lore.altlinux.org/devel/>
List-Post: <mailto:devel@altlinux.org>

=E4=CF=C2=D2=D9=CA =C4=C5=CE=D8.

=E8=CF=DE=D5 =CF=C2=CE=CF=D7=C9=D4=D8 libvirt =C4=CF =D7=C5=D2=D3=C9=C9 0.7=
.5.

=E4=C5=CC=C1=C0.
1. git fetch upstream. =F4=D5=D4 =D7=D3=C5 =CE=CF=D2=CD=C1=CC=D8=CE=CF.
2. git merge v0.7.5

=D0=CF=CC=D5=DE=C1=C0 =D7=DA=D2=D9=D7.

$ git merge v0.7.5
Auto-merging .gnulib
CONFLICT (submodule): Merge conflict in .gnulib
Auto-merging autogen.sh
CONFLICT (content): Merge conflict in autogen.sh
Removing build-aux/link-warning.h
Removing build-aux/mktempd
Auto-merging po/ru.po
Auto-merging python/Makefile.am
Auto-merging src/openvz/openvz_conf.c
Auto-merging src/openvz/openvz_driver.c
Auto-merging src/qemu/qemu_conf.c
Auto-merging src/xen/proxy_internal.c
Automatic merge failed; fix conflicts and then commit the result.

$ git status
--=CB=D5=D3=D8--
# Unmerged paths:
#   (use "git reset HEAD <file>..." to unstage)
#   (use "git add <file>..." to mark resolution)
#
#       both modified:      .gnulib
#       both modified:      autogen.sh
#

[alb@book libvirt]$ git add .gnulib
error: unable to index file .gnulib
fatal: updating files failed

[alb@book libvirt]$ git update-index .gnulib
error: .gnulib: is a directory - add files inside instead
fatal: Unable to process path .gnulib

$ git submodule
-28db629d4f20b514087389b0339b5ba8c83a707b .gnulib
-c9dd0005fe00602d13c3d54f0834655b1e769520 .gnulib
-3fd9a2df88c558b27be3a585ca2978dbf9b5da53 .gnulib

=EB=C1=CB =DC=D4=CF =CC=C5=DE=C9=D4=D3=D1?