From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: 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.5 required=5.0 tests=BAYES_00,DNS_FROM_OPENWHOIS autolearn=no version=3.2.5 From: Vitaly Kuznetsov To: "devel\@ where you _can_ ask" References: <4C9761FC.6080906@yandex.ru> Date: Mon, 20 Sep 2010 13:47:59 +0000 In-Reply-To: <4C9761FC.6080906@yandex.ru> (=?utf-8?B?ItCg0LDQtNC40Log0K4=?= =?utf-8?B?0YHRg9C/0L7QsiIncw==?= message of "Mon, 20 Sep 2010 17:30:36 +0400") Message-ID: <871v8o4jcg.fsf@vps2.branbackup.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/23.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit Subject: Re: [newbies] Fwd: [#29133] 5.1 FAILED lxde-settings-altlinux.git=0.1-alt0.M51.2 X-BeenThere: devel-newbies@lists.altlinux.org X-Mailman-Version: 2.1.12 Precedence: list Reply-To: "devel@ where you _can_ ask" List-Id: "devel@ where you _can_ ask" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 20 Sep 2010 13:48:10 -0000 Archived-At: List-Archive: Радик Юсупов writes: > http://git.altlinux.org/tasks/29133/task/log > > кусь > 2010-Sep-17 13:18:04 :: install check OK > 2010-Sep-17 13:18:05 :: error: lxde-settings-altlinux.git tag > 0.1-alt0.M51.2' is not inherited from > /gears/l/lxde-settings-abstraction-lite.git branch `5.1' > 2010-Sep-17 13:18:05 :: gears inheritance check FAILED > 2010-Sep-17 13:18:05 :: task #29133 for 5.1 FAILED > > Как это могло произойти? > ssh git.alt find-package lxde-settings-abstraction-lite ничего не > дает. > > Как-то странно...и что делать? Нужно унаследовать ветку 5.1 из git://git.altlinux.org/gears/l/lxde-settings-abstraction-lite.git т.е. git remote add gears git://git.altlinux.org/gears/l/lxde-settings-abstraction-lite.git git fetch gears git merge gears/5.1 ну и т.д. если мерждиться на самом деле не хочется, то git merge -s ours -- Vitaly Kuznetsov, ALT Linux