From: Vitaly Kuznetsov <vitty@altlinux.ru>
To: <devel@lists.altlinux.org>
Subject: Re: [devel] tag is not inherited from branch
Date: Fri, 27 Apr 2012 13:31:57 +0400
Message-ID: <5729a5c32293a15f6bb3b83772c55df8@hadoop.ru> (raw)
In-Reply-To: <393421335515376@web2e.yandex.ru>
On Fri, 27 Apr 2012 12:29:36 +0400, Bergman Andrey wrote:
> Добрый день!
>
> При заливке пакета в Sisyphus получаю ошибку
>
> error: i3.git tag `i3-4.2-alt1.1' is not inherited from
> /gears/i/i3.git branch `sisyphus'
> 2012-Apr-27 11:56:12 :: gears inheritance check FAILED
> 2012-Apr-27 11:56:12 :: task #70408 for sisyphus FAILED
>
> Что делать? Пакет целиком и полностью мой.
>
Коммиты с тегом 4.1.2-alt1.1 у вас и в /gears различаются, сравните:
http://git.altlinux.org/people/vkni/packages/?p=i3.git;a=commit;h=10e7435807beeeb1c54f4cc3cba22ab3644692d5
http://git.altlinux.org/gears/i/i3.git?p=i3.git;a=commit;h=8f4e4511af8fc2edea18ad6d25857423ce7ff478
Если вы уверены, что ничего не потеряли, то:
git remote add gears git://git.altlinux.org/gears/i/i3.git
git fetch gears
git merge -s ours gears/sisyphus
next prev parent reply other threads:[~2012-04-27 9:31 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-04-27 8:29 Bergman Andrey
2012-04-27 8:47 ` Denis Klimov
2012-04-27 9:31 ` Vitaly Kuznetsov [this message]
2012-04-27 9:55 ` Bergman Andrey
2012-04-27 11:34 ` Vitaly Kuznetsov
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=5729a5c32293a15f6bb3b83772c55df8@hadoop.ru \
--to=vitty@altlinux.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