From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Date: Mon, 27 Nov 2006 17:31:01 +0300 From: Sergey Vlasov To: devel@lists.altlinux.org Message-ID: <20061127143101.GB5381@master.mivlgu.local> Mail-Followup-To: devel@lists.altlinux.org References: <20061127154826.10329918.bga@altlinux.org> Mime-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="MW5yreqqjyrRcusr" Content-Disposition: inline In-Reply-To: <20061127154826.10329918.bga@altlinux.org> Subject: Re: [devel] =?koi8-r?b?Z2VhciDJINDB1N7J?= X-BeenThere: devel@lists.altlinux.org X-Mailman-Version: 2.1.9rc1 Precedence: list Reply-To: ALT Devel discussion list List-Id: ALT Devel discussion list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 27 Nov 2006 14:31:37 -0000 Archived-At: List-Archive: List-Post: --MW5yreqqjyrRcusr Content-Type: text/plain; charset=koi8-r Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Mon, Nov 27, 2006 at 03:48:26PM +0300, Grigory Batalov wrote: > =ED=CF=D6=CE=CF =CC=C9 (=C9=CC=C9 =CD=CF=D6=CE=CF =CC=C9 =C2=D5=C4=C5=D4)= =D7 .gear-rules =D5=CB=C1=DA=D9=D7=C1=D4=D8 =D7 =CB=C1=DE=C5=D3=D4=D7=C5 = =D0=C1=D4=DE=C5=CA > =CB=CF=CD=CD=C9=D4=D9 =C9=DA git? =F4=C9=D0=C1 <=CE=C1=DA=D7=C1=CE=C9=C5 = =D0=C1=D4=DE=C1>: <=CF=D4=CB=D5=C4=C1>-<=C4=CF =CB=D5=C4=C1> =C9=CC=C9 =C4= =C1=D6=C5 > <=CE=C1=DA=D7=C1=CE=C9=C5 =D0=C1=D4=DE=C1>: <=CF=D4=CB=D5=C4=C11>-<=C4=CF= =CB=D5=C4=C11>,<=CF=D4=CB=D5=C4=C12>-<=C4=CF =CB=D5=C4=C12>. >=20 > =EE=C1=D0=D2=C9=CD=C5=D2: > foo-0.1-alt-build.patch: f9f580742b3b499e4a0fb298511f42f482a14928:bbab731= ee05b4a9211545309d9fdf2954a7e8961 =F7 =D0=CF=D3=CC=C5=C4=CE=C5=CA =D7=C5=D2=D3=C9=C9 gear =DC=D4=CF =CD=CF=D6= =C5=D4 =C2=D9=D4=D8 =DA=C1=D0=C9=D3=C1=CE=CF =D7 =D7=C9=C4=C5: diff: f9f580742b3b499e4a0fb298511f42f482a14928:. bbab731ee05b4a9211545309d9= fdf2954a7e8961:. name=3Dfoo-0.1-alt-build.patch (=D7 name=3D... =CD=CF=D6=CE=CF =C9=D3=D0=CF=CC=D8=DA=CF=D7=C1=D4=D8 @name@= , @version@, @release@, @old_dir@, @new_dir@). =ED=CF=D6=CE=CF =D4=C1=CB=D6=C5 =CE=C1=D0=C9=D3=C1= =D4=D8 diff.gz =C9=CC=C9 diff.bz2. =EF=C7=D2=C1=CE=C9=DE=C5=CE=C9=C5 - =CE=C5=CC=D8=DA=D1 =D5=CB=C1=DA=D9=D7= =C1=D4=D8 =D3=CF=D7=D3=C5=CD =D0=D2=CF=C9=DA=D7=CF=CC=D8=CE=D9=C5 sha1, =DC= =D4=CF =C4=CF=CC=D6=CE=D9 =C2=D9=D4=D8 =CB=CF=CD=CD=C9=D4=D9, =D0=D2=C5=C4=DB=C5=D3=D4=D7=D5=C0=DD=C9= =C5 (=CE=C5=D0=CF=D3=D2=C5=C4=D3=D4=D7=C5=CE=CE=CF =C9=CC=C9 =DE=C5=D2=C5= =DA =D0=D2=CF=C9=DA=D7=CF=CC=D8=CE=CF=C5 =CB=CF=CC=C9=DE=C5=D3=D4=D7=CF =D0=D2=CF=CD=C5=D6=D5=D4=CF=DE=CE=D9=C8 =CB= =CF=CD=CD=C9=D4=CF=D7) =D4=CF=CD=D5 =CB=CF=CD=CD=C9=D4=D5, =C9=DA =CB=CF=D4= =CF=D2=CF=C7=CF =D3=CF=C2=C9=D2=C1=C5=D4=D3=D1 =D0=C1=CB=C5=D4. =FE=D4=CF=C2=D9 =CE=C5 =D0=C9=D3=C1=D4=D8 sha1 =D7 .gear-rules, =CD=CF=D6= =CE=CF =C9=D3=D0=CF=CC=D8=DA=CF=D7=C1=D4=D8 =D7=CD=C5=D3=D4=CF =CE=C9=C8 =C9=CD=C5=CE=C1 =D4=C5=C7=CF=D7, =D3=CF=C8=D2=C1=CE=A3=CE=CE=D9=C8 =D3 =D0= =CF=CD=CF=DD=D8=C0 gear-update-tag. =E8=CF=D4=D1 =DC=D4=CF=D4 =D7=C1=D2=C9= =C1=CE=D4 =D0=D2=C9=CD=C5=CE=C9=CD =D7 =CF=D3=CE=CF=D7=CE=CF=CD =D7 =D3=CC=D5=DE=C1= =C5, =CB=CF=C7=C4=C1 =C7=C5=CE=C5=D2=C9=D2=D5=C5=D4=D3=D1 =CF=C4=C9=CE =CF= =C2=DD=C9=CA =D0=C1=D4=DE: diff: v@version@:. . (=D0=CF =D5=CD=CF=CC=DE=C1=CE=C9=C0 name=3D@new_dir@-@version@-@release@.pa= tch, =D0=D2=C9 =D5=CB=C1=DA=C1=CE=C9=C9 "." =D7=CD=C5=D3=D4=CF @new_dir@ =C9=D3=D0=CF=CC=D8=DA=D5=C5=D4=D3=D1 @name= @). =EF=C7=D2=C1=CE=C9=DE=C5=CE=C9=D1 =CE=C1 =D5=CB=C1=DA=C1=CE=C9=C5 =CB=CF=CD=CD=C9=D4=CF=D7 =DE=C5=D2=C5=DA =C9=CD=C5=CE=C1 =D4=C5=C7=CF=D7 = =D4=C5 =D6=C5 =D3=C1=CD=D9=C5. > =ED=CE=C5 =CB=C1=D6=C5=D4=D3=D1, =D5=C4=CF=C2=CE=C5=C5 =C9=D3=D0=D2=C1=D7= =CC=D1=D4=D8 =C9=D3=C8=CF=C4=CE=C9=CB=C9 =CE=C5=D0=CF=D3=D2=C5=C4=D3=D4=D7= =C5=CE=CE=CF =D7 git, > =D3=CB=C1=D6=C5=CD, =D7 =C2=D2=C1=CE=DE=C5 devel, =C1 =CE=C5 =CF=C2=CE=CF= =D7=CC=D1=D4=D8 =CF=D4 =D7=C5=D2=D3=C9=C9 =CB =D7=C5=D2=D3=C9=C9 =C6=C1=CA= =CC=D9 > .patch. =F4=CF=C7=C4=C1 =D7=CF=DA=CE=C9=CB=C1=C5=D4 =D7=CF=D0=D2=CF=D3, =DE=D4=CF = =C4=C5=CC=C1=D4=D8 =D0=D2=C9 =CF=C2=CE=CF=D7=CC=C5=CE=C9=C9 =C4=CF =CE=CF= =D7=CF=CA =D7=C5=D2=D3=C9=C9. =E5=D3=D4=C5=D3=D4=D7=C5=CE=CE=D9=CA =C4=CC=D1 git =D7=C1=D2=C9=C1=CE=D4 - = =CF=C2=DF=C5=C4=C9=CE=C9=D4=D8 =C9=DA=CD=C5=CE=C5=CE=C9=D1 =D3 =CE=CF=D7=CF= =CA =D7=C5=D2=D3=C9=C5=CA =DE=C5=D2=C5=DA git-pull (=D4.=C5., merge), =CE=CF =D0=D2=C9 =DC=D4=CF=CD = =D2=C5=DA=D5=CC=D8=D4=C1=D4 =D7 =CF=C2=DD=C5=CD =D3=CC=D5=DE=C1=C5 =D5=D6=C5 =CE=C5 =D0=D2=C5=C4=D3=D4=C1=D7=CC=D1=C5=D4=D3=D1 =D7 =D7=C9=C4=C5 =CE=C1= =C2=CF=D2=C1 =D0=C1=D4=DE=C5=CA - =CD=CF=D6=CE=CF =D3=C4=C5=CC=C1=D4=D8 =D4= =CF=CC=D8=CB=CF =CF=C4=C9=CE =CF=C2=DD=C9=CA =D0=C1=D4=DE =CF=D4 =CF=D2=C9=C7=C9=CE=C1=CC=D8=CE=CF=CA = =D7=C5=D2=D3=C9=C9 =CB =CD=CF=C4=C9=C6=C9=C3=C9=D2=CF=D7=C1=CE=CE=CF=CA. = =FE=D4=CF=C2=D9 =D0=CF=CC=D5=DE=C9=D4=D8 =CB=C1=CB=CF=C5-=D4=CF =CF=C4=CE=CF =C9=DA=CD=C5=CE=C5=CE=C9=C5 =D7 =D7=C9= =C4=C5 =D0=C1=D4=DE=C1 =CB =D4=C5=CB=D5=DD=C5=CA =D7=C5=D2=D3=C9=C9, =D0=D2= =C9=C4=A3=D4=D3=D1 =D7=D9=D0=CF=CC=CE=D1=D4=D8, =CE=C1=D0=D2=C9=CD=C5=D2, git-cherry-pick =D7 = =CF=D4=C4=C5=CC=D8=CE=CF=CA =D7=D2=C5=CD=C5=CE=CE=CF=CA =D7=C5=D4=CB=C5 (=D4=C1=DD=C9=D4=D8 =C5=C7=CF =D7 =C9=D3=D4=CF=D2=C9=C0 =D0=C1=CB=C5=D4=C1 = =D0=D2=C9 =D4=C1=CB=CF=CD =D3=D0=CF=D3=CF=C2=C5 =D2=C1=C2=CF=D4=D9 =C2=C5= =D3=D3=CD=D9=D3=CC=C5=CE=CE=CF - =CF=CE=CF =D4=C1=CD =D5=D6=C5 =C5=D3=D4=D8, =D7=CF=DA=CD=CF=D6=CE=CF, =D3 = =C9=D3=D0=D2=C1=D7=CC=C5=CE=C9=D1=CD=C9, =D7=CE=C5=D3=A3=CE=CE=D9=CD=C9 =D7= =C8=CF=C4=C5 =D2=C1=DA=D2=C5=DB=C5=CE=C9=D1 =CB=CF=CE=C6=CC=C9=CB=D4=CF=D7 =D0=D2=C9 mer= ge; =C5=C4=C9=CE=D3=D4=D7=C5=CE=CE=C1=D1 =D0=D2=C9=DE=C9=CE=C1 =C4=C5=CC=C1= =D4=D8 =DC=D4=CF - =CE=C5=CF=C2=C8=CF=C4=C9=CD=CF=D3=D4=D8 =D0=CF=C4=C7=CF=D4=CF=D7=CB=C9 =D0= =C1=D4=DE=C1 =C4=CC=D1 =D0=C5=D2=C5=C4=C1=DE=C9, =CE=C1=D0=D2=C9=CD=C5=D2, = =D7 upstream). =EB=D3=D4=C1=D4=C9, =CD=CF=D6=CE=CF =DA=C1=D7=C5=D3=D4=C9 =CE=C5 =CF=C4=C9= =CE =C2=D2=C1=CE=DE devel, =C1 =CE=C5=D3=CB=CF=CC=D8=CB=CF, =CB=D5=C4=C1 = =D2=C1=DA=CE=CF=D3=C9=D4=D8 =C9=DA=CD=C5=CE=C5=CE=C9=D1, =CF=D4=CE=CF=D3=D1=DD=C9=C5=D3=D1 =CB =D2=C1= =DA=CE=D9=CD =D0=CF =D3=CD=D9=D3=CC=D5 =C9=D3=D0=D2=C1=D7=CC=C5=CE=C9=D1=CD. =E5=D3=D4=D8 =C4=D2=D5=C7=CF=CA =D7=C1=D2=C9=C1=CE=D4 - git-rebase =D0=D2= =C9 =D0=C5=D2=C5=C8=CF=C4=C5 =CE=C1 =CE=CF=D7=D5=C0 =D7=C5=D2=D3=C9=C0 =C9= =DA upstream; =D7 =DC=D4=CF=CD =D3=CC=D5=DE=C1=C5 =CF=D4=C4=C5=CC=D8=CE=D9=C5 = =D0=C1=D4=DE=C9 =D3=CF=C8=D2=C1=CE=D1=C0=D4=D3=D1, =CE=CF =D4=C5=D2=D1=C5= =D4=D3=D1 =D3=D7=D1=DA=D8 =D3 =D0=D2=C5=C4=D9=C4=D5=DD=C5=CA =C9=D3=D4=CF=D2=C9=C5=CA =D0=C1=CB=C5=D4= =C1, =DE=D4=CF =D7 =CE=CF=D7=CF=CA =D3=C9=D3=D4=C5=CD=C5 =D3=C2=CF=D2=CB=C9= =CE=C5=C4=CF=D0=D5=D3=D4=C9=CD=CF. =F0=D2=C1=D7=C4=C1, =CD=CF=D6=CE=CF =D7=CF=D3=D3=D4=C1=CE=CF=D7=C9=D4=D8 = =DC=D4=D5 =D3=D7=D1=DA=D8 =DE=C5=D2=C5=DA git-pull -s ours, =CE=CF =D0=D2=C9 =D4=C1=CB=CF=CD =D3=D0=CF=D3=CF=C2=C5 =C9=D3=D4=CF=D2=C9=D1 =C2=D5=C4=C5=D4= =DA=C1=D3=CF=D2=D1=D4=D8=D3=D1 =CD=CE=CF=C7=CF=DE=C9=D3=CC=C5=CE=CE=D9=CD= =C9 =CB=CF=D0=C9=D1=CD=C9 =CF=C4=CE=C9=C8 =C9 =D4=C5=C8 =D6=C5 =C9=DA=CD=C5=CE=C5=CE=C9=CA =C4=CC=D1 =D2=C1=DA=CE=D9=C8 = =D7=C5=D2=D3=C9=CA =D0=C1=CB=C5=D4=C1 (=D7=D0=D2=CF=DE=C5=CD, =D7 =DC=D4=CF= =CD =D3=CC=D5=DE=C1=C5 =D3=D4=C1=D2=D5=C0 =C9=D3=D4=CF=D2=C9=C0 =CD=CF=D6=CE=CF =C2=D5=C4=C5=D4 = =D0=D2=CF=D3=D4=CF =CF=D4=D3=C5=DE=D8 =D0=D2=C9 =D0=D2=CF=D3=CD=CF=D4=D2=C5= =C9=DA=CD=C5=CE=C5=CE=C9=CA, =D0=CF=D3=CB=CF=CC=D8=CB=D5 =CF=CE=C1 =CE=C5 =C2=D5=C4=C5=D4 =D3=CF=C4=C5= =D2=D6=C1=D4=D8 =D0=CF=CC=C5=DA=CE=CF=CA =C9=CE=C6=CF=D2=CD=C1=C3=C9=C9 - = =D7=D3=C5 =C9=DA=CD=C5=CE=C5=CE=C9=D1 =CF=D4=CE=CF=D3=C9=D4=C5=CC=D8=CE=CF upstream =D0=CF=D3=CC=C5 git-rebase = =C2=D5=C4=D5=D4 =D7=CF=D3=D0=D2=CF=C9=DA=D7=C5=C4=C5=CE=D9 =D7 =CE=CF=D7=D9= =C8 =CB=CF=CD=CD=C9=D4=C1=C8, =CC=C9=C2=CF =D5=C4=C1=CC=C5=CE=D9, =C5=D3=CC=C9 = =CF=CE=C9 =D5=D6=C5 =D7=CF=DB=CC=C9 =D7 upstream). > =F4=C5=CD =C2=CF=CC=C5=C5, =DE=D4=CF =D0=CF=D3=CC=C5=C4=CE=C9=C5 =CF=C2= =D9=DE=CE=CF =CE=C1=DA=D9=D7=C1=C0=D4 > --alt-.patch, =D4=CF =C5=D3=D4=D8 =DC=D4=C9 =C6= =C1=CA=CC=D9 =C2=D5=C4=D5=D4 > =D0=CF=D1=D7=CC=D1=D4=D8=D3=D1 =C9 =C9=D3=DE=C5=DA=C1=D4=D8 =D0=D2=C9 =D3= =CD=C5=CE=C5 . =FA=C1=DE=C1=D3=D4=D5=C0 =D0=D2=C9 =D3=CD=C5=CE=C5 =D3=D4=C1=D2= =D9=C5 =D0=C1=D4=DE=C9 =CB=C1=CB =D2=C1=DA =CE=C5 =D0=C5=D2=C5=C7=C5=CE=C5= =D2=C9=D2=D5=C0=D4=D3=D1, =D0=CF=CB=C1 =CF=CB=CF=CE=DE=C1=D4=C5=CC=D8=CE=CF =CE=C5 =D0=C5=D2=C5=D3=D4= =C1=CE=D5=D4 =D0=D2=C9=CB=CC=C1=C4=D9=D7=C1=D4=D8=D3=D1. =F7 =CE=C5=CB=CF= =D4=CF=D2=D9=C8 =D3=CC=D5=DE=C1=D1=C8 =DC=D4=CF =D0=D2=C9=D7=CF=C4=C9=D4 =CB =D4=D2=D5=C4=CE=CF=D7=D9=D1=D7=CC=D1= =C5=CD=D9=CD =D0=D2=CF=C2=CC=C5=CD=C1=CD, =CB=CF=C7=C4=C1 =D0=C1=D4=DE =D7= =D2=CF=C4=C5 =C2=D9 =CC=CF=D6=C9=D4=D3=D1 =CE=C1 =CE=CF=D7=D5=C0 =D7=C5=D2=D3=C9=C0, =CE=CF =CB=C1=CB=C9=C5-=D4=CF = =C9=DA=CD=C5=CE=C5=CE=C9=D1 =D0=CF=D0=C1=C4=C1=C0=D4 =D3=CF=D7=D3=C5=CD =CE= =C5 =D4=D5=C4=C1, =CB=D5=C4=C1 =CE=C1=C4=CF. =F4=C5=CF=D2=C5=D4=C9=DE=C5=D3=CB=C9 =C1=CC=C7=CF=D2=C9=D4= =CD 3-way merge =CD=CF=D6=C5=D4 =C2=D9=D4=D8 =C2=CF=CC=C5=C5 =D5=D3=D4=CF= =CA=DE=C9=D7 =CB =D0=CF=C4=CF=C2=CE=D9=CD =CF=DB=C9=C2=CB=C1=CD, =DE=C5=CD patch, =D0=CF=D3= =CB=CF=CC=D8=CB=D5 =C9=CD=C5=C5=D4 =C2=CF=CC=D8=DB=C5 =C9=CE=C6=CF=D2=CD=C1= =C3=C9=C9 (=C9=CE=C6=CF=D2=CD=C1=C3=C9=D1 =CF=C2 =C9=DA=CD=C5=CE=C5=CE=C9=D1=C8 =CE= =C5 =CF=C7=D2=C1=CE=C9=DE=C5=CE=C1 =D2=C1=DA=CD=C5=D2=CF=CD =CB=CF=CE=D4=C5= =CB=D3=D4=C1, =CB=C1=CB =D7 =D3=CC=D5=DE=C1=C5 patch). =E8=CF=D4=D1 =D0=D2=C9 =D7=D9=D0=CF=CC=CE=C5=CE= =C9=C9 git-rebase =D7=CF=DA=CD=CF=D6=CE=CF=D3=D4=D8 =D0=CF=CC=D5=DE=C9=D4=D8 =D4=C1=CB=D5=C0 =D0=D2=CF=C2=CC=C5=CD=D5 =D3=CF=C8=D2=C1=CE=D1=C5=D4=D3=D1,= =D0=CF=D3=CB=CF=CC=D8=CB=D5 =D0=CF =D5=CD=CF=CC=DE=C1=CE=C9=C0 (=C2=C5=DA = =CF=D0=C3=C9=C9 --merge) git-rebase =D3=CE=C1=DE=C1=CC=C1 =D0=D9=D4=C1=C5=D4=D3=D1 =D0=D2=C9=CC=CF= =D6=C9=D4=D8 =C9=DA=CD=C5=CE=C5=CE=C9=C5 =CB=C1=CB =D0=C1=D4=DE, =C9 =D4=CF= =CC=D8=CB=CF =D7 =D4=CF=CD =D3=CC=D5=DE=C1=C5, =C5=D3=CC=C9 =DC=D4=CF =CE=C5 =D5=C4=C1=A3=D4= =D3=D1, =C9=D3=D0=CF=CC=D8=DA=D5=C5=D4 3-way merge. > =ED=CF=D6=CE=CF =C2=D9=CC=CF =C2=D9 =D0=D2=CF=D3=D4=CF =D0=C1=CB=CF=D7=C1= =D4=D8 =D7 SRPM =CD=CF=C4=C9=C6=C9=C3=C9=D2=CF=D7=C1=CE=CE=CF=C5 =C4=C5=D2= =C5=D7=CF > =C9=D3=C8=CF=C4=CE=C9=CB=CF=D7, =CE=CF =D4=CF=C7=C4=C1 =CB=C1=CB =D5=CB= =C1=DA=C1=D4=D8 =CE=C1 =CB=CF=CE=CB=D2=C5=D4=CE=CF=C5 =C9=D3=D0=D2=C1=D7=CC= =C5=CE=C9=C5 > =D0=CF=CC=D8=DA=CF=D7=C1=D4=C5=CC=D1=CD =C4=D2=D5=C7=C9=C8 =C4=C9=D3=D4= =D2=C9=C2=D5=D4=C9=D7=CF=D7? =EF=D4=D3=D9=CC=C1=D4=D8 =D7 =CE=C1=DB git? =EF=D4=D3=D9=CC=C1=D4=D8 =C2=D9=CC=CF =C2=D9 =C8=CF=D2=CF=DB=CF =D7 gitweb,= =CE=CF =C5=C7=CF =D5 =CE=C1=D3 =D0=CF=CB=C1 =CE=C5=D4. =F3 =C4=D2=D5=C7= =CF=CA =D3=D4=CF=D2=CF=CE=D9, =C5=D3=CC=C9 =D0=D2=C5=C4=D0=CF=CC=C1=C7=C1=C5=D4=D3= =D1 =D5=D0=D2=C1=DA=C4=CE=C5=CE=C9=C5 src.rpm, =CB=C1=CB=CF=C5-=D4=CF =D3= =D2=C5=C4=D3=D4=D7=CF =D4=C9=D0=C1 gitweb =C4=CF=CC=D6=CE=CF =D0=CF=D1=D7=C9=D4=D8=D3=D1 =D2=C1= =CE=D8=DB=C5 =DC=D4=CF=C7=CF. --MW5yreqqjyrRcusr Content-Type: application/pgp-signature Content-Disposition: inline -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.2.4 (GNU/Linux) iD8DBQFFavalW82GfkQfsqIRAoe/AJ0Wc3FRmRO9UnRgypUMDM6vl6aujQCeLVkt Pf05NRa/bSb7CIwmxdnuAIc= =ntPG -----END PGP SIGNATURE----- --MW5yreqqjyrRcusr--