From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <radyus@yandex.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=-1.5 required=5.0 tests=BAYES_00, DNS_FROM_OPENWHOIS, 
	SPF_PASS autolearn=no version=3.2.5
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yandex.ru; s=mail;
	t=1309744792; bh=4p6AkoU2X7Ay6OnLrEXWSwnEEubzzJmW8gD6sqYP1B4=;
	h=Message-ID:Date:From:MIME-Version:To:Subject:References:
	In-Reply-To:Content-Type:Content-Transfer-Encoding;
	b=FziZ90bhOSwDPd6tg8ugq/IBkDU1LAGgkK9miXnnMXTMmT+iUfDUvSb/UXgVeL8nj
	ABfyDGl9Ts0YBgNwrcSw+KT2zOI+C2vTL6cwOjM1zGR6W5J5IsWoQwZuPI42ZhippB
	bDs5iE7M0BmsoYZaW4XBdyE6wCeyErpMLoHbouvo=
Message-ID: <4E111FAE.8050109@yandex.ru>
Date: Mon, 04 Jul 2011 06:04:30 +0400
From: =?KOI8-R?Q?=F2=C1=C4=C9=CB_=E0=D3=D5=D0=CF=D7?= <radyus@yandex.ru>
User-Agent: Mozilla/5.0 (X11; U; Linux i686; en-US;
	rv:1.9.2.17pre) Gecko/20110410 Lightning/1.0b3pre
	Thunderbird/3.1.10pre
MIME-Version: 1.0
To: devel@lists.altlinux.org
References: <4E10DDA1.9060301@gmail.com>
In-Reply-To: <4E10DDA1.9060301@gmail.com>
Content-Type: text/plain; charset=KOI8-R; format=flowed
Content-Transfer-Encoding: 8bit
X-Yandex-Spam: 1
Subject: Re: [devel] Fwd: [#49696] 5.1 FAILED qps.git=1.10.13-alt0.M51.1
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: Mon, 04 Jul 2011 01:59:56 -0000
Archived-At: <http://lore.altlinux.org/devel/4E111FAE.8050109@yandex.ru/>
List-Archive: <http://lore.altlinux.org/devel/>
List-Post: <mailto:devel@altlinux.org>

04.07.2011 01:22, Motsyo Gennadi aka Drool пишет:
> Это последствия мерженья в мой локальный гит результата творчества
> репокопа. Как тут теперь выровнять правильно? При том, что сборка в
> сизиф и t6 прошли нормально.
Сначала мержишься с gear-репозиторием из 5.1, а потом уже мержишься с 
творчествами роботов ;)

-- 
ALTLinux Team
E-mail/XMPP:radyus@ya.ru
Project: http://lxdesktop.altlinux.org