From: Aleksey Avdeev <solo@solin.spb.ru>
To: ALT Linux Team development discussions <devel@lists.altlinux.org>
Subject: Re: [devel] Как обновить libvirt
Date: Sat, 20 Mar 2010 00:34:26 +0300
Message-ID: <4BA3EDE2.7070705@solin.spb.ru> (raw)
In-Reply-To: <3f60a831003182231x4725aa1aj129ce2125e629140@mail.gmail.com>
[-- Attachment #1: Type: text/plain, Size: 1353 bytes --]
19.03.2010 08:31, Alexey Borovskoy пишет:
> Добрый день.
>
> При попытке обновить libvirt
>
> $ git merge v0.7.7
> Auto-merging .gitignore
> CONFLICT (content): Merge conflict in .gitignore
> Auto-merging autogen.sh
> CONFLICT (content): Merge conflict in autogen.sh
> Auto-merging bootstrap
> CONFLICT (content): Merge conflict in bootstrap
> Auto-merging configure.ac
> Auto-merging daemon/libvirtd.init.in
> Removing po/Makevars
> Auto-merging po/ru.po
> Auto-merging src/openvz/openvz_conf.c
> Auto-merging src/openvz/openvz_conf.h
> CONFLICT (content): Merge conflict in src/openvz/openvz_conf.h
> 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.
>
> Веток с патчами как всегде нет. Найти в груде коммитов именения,
> которые прикладывали к апстримному дереву практически невозможно.
> Как же мне обновить пакет то?
Вот такое
<http://git.altlinux.org/people/solo/packages/?p=libvirt.git;a=commit;h=8fd3512ac3c229ac9f74696dde105cdabce36286>
(бранч master) начало собираться.
PS: Отрыв git и rsync в ALT/fix/bootstrap (см.
<http://git.altlinux.org/people/solo/packages/?p=libvirt.git;a=commit;h=0af27299977cd4704e4b82eebc161e732d599fe3>)
--
С уважением. Алексей.
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 554 bytes --]
next prev parent reply other threads:[~2010-03-19 21:34 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-03-19 5:31 Alexey Borovskoy
2010-03-19 5:48 ` Anton Farygin
2010-03-19 8:04 ` Alexey I. Froloff
2010-03-19 21:34 ` Aleksey Avdeev [this message]
2010-03-19 21:44 ` Aleksey Avdeev
2010-03-20 8:08 ` Aleksey Avdeev
2010-03-20 13:38 ` [devel] A: libvirt: взаимодействие с апстримом (was: Как обновить libvirt) Aleksey Avdeev
2010-03-20 13:43 ` Dmitry V. Levin
2010-03-20 17:02 ` Dmitry V. Levin
2010-03-20 17:57 ` [devel] A: libvirt: взаимодействие с апстримом Aleksey Avdeev
2010-03-20 18:08 ` Dmitry V. Levin
2010-03-20 18:58 ` Aleksey Avdeev
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=4BA3EDE2.7070705@solin.spb.ru \
--to=solo@solin.spb.ru \
--cc=devel@lists.altlinux.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
ALT Linux Team development discussions
This inbox may be cloned and mirrored by anyone:
git clone --mirror http://lore.altlinux.org/devel/0 devel/git/0.git
# If you have public-inbox 1.1+ installed, you may
# initialize and index your mirror using the following commands:
public-inbox-init -V2 devel devel/ http://lore.altlinux.org/devel \
devel@altlinux.org devel@altlinux.ru devel@lists.altlinux.org devel@lists.altlinux.ru devel@linux.iplabs.ru mandrake-russian@linuxteam.iplabs.ru sisyphus@linuxteam.iplabs.ru
public-inbox-index devel
Example config snippet for mirrors.
Newsgroup available over NNTP:
nntp://lore.altlinux.org/org.altlinux.lists.devel
AGPL code for this site: git clone https://public-inbox.org/public-inbox.git