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.2 required=5.0 tests=AWL,BAYES_00 autolearn=ham version=3.2.5 X-Virus-Scanned: amavisd-new at lav.sp.ru From: Vitaly Lipatov Organization: ALT Linux Team To: ALT Linux Team development discussions Date: Thu, 26 Nov 2009 11:36:54 +0300 User-Agent: KMail/1.9.10 References: <200911120038.01606.lav@altlinux.ru> <200911261051.39206.lav@altlinux.ru> <4B0E3858.8070201@mmedia2.kemsu.ru> In-Reply-To: <4B0E3858.8070201@mmedia2.kemsu.ru> MIME-Version: 1.0 Content-Type: text/plain; charset="koi8-r" Content-Transfer-Encoding: 8bit Content-Disposition: inline Message-Id: <200911261136.55300.lav@altlinux.ru> Subject: Re: [devel] =?koi8-r?b?8MXSxdfPxCB3aW5lLXZhbmlsbGEg1yBnaXQ=?= X-BeenThere: devel@lists.altlinux.org X-Mailman-Version: 2.1.12 Precedence: list Reply-To: ALT Linux Team development discussions List-Id: ALT Linux Team development discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 26 Nov 2009 08:37:11 -0000 Archived-At: List-Archive: List-Post: On 26 ноября 2009, REAL wrote: > Vitaly Lipatov пишет: > > 2009-Nov-25 04:29:55 :: error: wine-vanilla.git tag > > `1.1.33-alt1' is not inherited from > > /gears/w/wine-vanilla.git branch `sisyphus' > > 2009-Nov-25 04:29:55 :: gears inheritance check FAILED > > 2009-Nov-25 04:29:55 :: task #16540 for sisyphus FAILED > > Я в таких случаях обычно поступаю так: > > git remote add gears git.alt:/gears/w/wine-vanilla.git > git remote update > git checkout master [или какой там бранч используете] > git merge gears/sisyphus Эти репозитории ничего общего не имеют, там совершенно разные уровни каталогов, и никакой merge не пройдёт. -- С уважением, Виталий Липатов Санкт-Петербург GNU! ALT Linux Team! WINE! LaTeX! LyX! http://freesource.info