From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <vitty@altlinux.ru>
X-Spam-Checker-Version: SpamAssassin 3.2.5 (2008-06-10) on sa.int.altlinux.org
X-Spam-Level: 
X-Spam-Status: No, score=-2.6 required=5.0 tests=BAYES_00
	autolearn=unavailable version=3.2.5
To: <devel@lists.altlinux.org>
X-PHP-Originating-Script: 0:func.inc
MIME-Version: 1.0
Content-Type: text/plain;
 charset=UTF-8;
 format=flowed
Content-Transfer-Encoding: 8bit
Date: Fri, 27 Apr 2012 13:31:57 +0400
From: Vitaly Kuznetsov <vitty@altlinux.ru>
In-Reply-To: <393421335515376@web2e.yandex.ru>
References: <393421335515376@web2e.yandex.ru>
Message-ID: <5729a5c32293a15f6bb3b83772c55df8@hadoop.ru>
X-Sender: vitty@altlinux.ru
User-Agent: Roundcube Webmail/0.5.3
Subject: Re: [devel] tag is not inherited from branch
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: Fri, 27 Apr 2012 09:32:08 -0000
Archived-At: <http://lore.altlinux.org/devel/5729a5c32293a15f6bb3b83772c55df8@hadoop.ru/>
List-Archive: <http://lore.altlinux.org/devel/>
List-Post: <mailto:devel@altlinux.org>

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