[devel] Как обновить libvirt?

[Alexey Borovskoy]

Добрый день.

Хочу обновить libvirt до версии 0.7.5.

Делаю.
1. git fetch upstream. Тут все нормально.
2. git merge v0.7.5

получаю взрыв.

$ 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
--кусь--
# Unmerged paths:
#   (use "git reset HEAD <file>..." to unstage)
#   (use "git add <file>..." to mark resolution)
#
#       both modified:      .gnulib
#       both modified:      autogen.sh
#

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

[alb at 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

Как это лечится?