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=-2.5 required=5.0 tests=AWL,BAYES_00 autolearn=ham version=3.2.5 Message-ID: <4901ADBA.2010103@altlinux.org> Date: Fri, 24 Oct 2008 15:12:58 +0400 From: Vitaly Ostanin User-Agent: Thunderbird 2.0.0.14 (X11/20080719) MIME-Version: 1.0 To: ALT Linux Team development discussions References: <4900B695.2080100@altlinux.org> <20081023175213.GE21185@altlinux.org> <4900BE3C.1090206@altlinux.org> <20081023185119.GI21185@altlinux.org> In-Reply-To: <20081023185119.GI21185@altlinux.org> X-Enigmail-Version: 0.95.6 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="------------enigA068DC22CD7270F075986D7C" Subject: Re: [devel] gear: build from branch X-BeenThere: devel@lists.altlinux.org X-Mailman-Version: 2.1.10b3 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: Fri, 24 Oct 2008 11:15:02 -0000 Archived-At: List-Archive: List-Post: This is an OpenPGP/MIME signed message (RFC 2440 and 3156) --------------enigA068DC22CD7270F075986D7C Content-Type: text/plain; charset=KOI8-R; format=flowed Content-Transfer-Encoding: quoted-printable Alexey I. Froloff =D0=C9=DB=C5=D4: > * Vitaly Ostanin [081023 22:18]: >>>> =DE=C9=D4=C1=CC, =CE=C5 =D0=CF=CD=CF=C7=CC=CF. =EE=C1=D0=D2=C9=CD=C5= =D2, git-merge -s ours . upstream =CE=C5=20 >>>> =D2=C1=C2=CF=D4=C1=C5=D4: >>>> . - not something we can merge >>> merge !=3D pull, =C5=CD=D5 =CE=C5 =CE=C1=C4=CF =D5=CB=C1=DA=D9=D7=C1=D4= =D8 =D2=C5=CD=CF=D4=D5, =CF=CE =CD=C5=D2=D6=C9=D4 =D7 HEAD. >> =F1 =CF=D2=C9=C5=CE=D4=C9=D2=CF=D7=C1=CC=D3=D1 =CE=C1 =DC=D4=CF =D0=C9= =D3=D8=CD=CF: >> http://lists.altlinux.org/pipermail/devel/2008-April/072689.html > =E1, =CE=D5 =D4=C1=CD =D0=D2=C9=CD=C5=D2=C1 =CE=C5=D4. >=20 > git-merge -s ours upstream =E5=D3=D4=D8, =D1 =D4=C1=CB =C9 =C4=C5=CC=C1=CC. =EF=CB=C1=DA=C1=CC=CF=D3= =D8, =DE=D4=CF git-diff =CE=C5 =D0=CF=CB=C1=DA=D9=D7=C1=C5=D4, =DE=D4=CF = =C9=DA=CD=C5=CE=A3=CE .gear/tags/list, =C9 =D1 =C5=C7=CF =D0=CF=DC=D4=CF=CD= =D5 =CE=C5 =CB=CF=CD=CD=C9=D4=C9=CC. =FC=D4=CF =D4=C1=CB =C9=20 =DA=C1=C4=D5=CD=C1=CE=CF? =F7=CF=CF=C2=DD=C5 =D3=C8=C5=CD=C1 =CF=CB=C1=DA=C1=CC=C1=D3=D8 =C4=CF=D7=CF= =CC=D8=CE=CF =CE=C5=D5=C4=CF=C2=CE=C1=D1 =C4=CC=D1 =D2=C1=DA=D2=C1=C2=CF=D4= =CB=C9: git-checkout upstream =C9=DA=CD=C5=CE=C5=CE=C9=D1 git-commit git-checkout spec git-merge -s ours upstream gear-update-tag -a git-commit =D3=C2=CF=D2=CB=C1 =C9 =D7=D3=A3 =DC=D4=CF =D0=D2=C9 =CB=C1=D6=C4=CF=CD =C9=DA=CD=C5=CE=C5=CE= =C9=C9 =D7=CD=C5=D3=D4=CF git-commit =D3=C2=CF=D2=CB=C1 =CE=C5 =C7=CF=D7=CF=D2=D1 =D5=D6=C5 =CF =CE=C5=CE=D5=D6=CE=D9=C8 =DA=C1=D0= =C9=D3=D1=C8 =D7 git-log =CF=D4 =CB=CF=CD=CD=C9=D4=C1 =C4=CC=D1=20 gear-update-tag. --=20 Regards, Vyt mailto: vyt@altlinux.org JID: vitaly.ostanin@gmail.com --------------enigA068DC22CD7270F075986D7C Content-Type: application/pgp-signature; name="signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.9 (GNU/Linux) Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org iD4DBQFJAa2/4uqsUQ7Y/CQRAlQYAKCeYOtoPLBDeL7QiwcHttCXM6FVKwCWPd0H NkcbUCieeoj/axsUym2a6Q== =mAe5 -----END PGP SIGNATURE----- --------------enigA068DC22CD7270F075986D7C--