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=-0.9 required=5.0 tests=BAYES_00,FUZZY_XPILL autolearn=no version=3.2.5 X-Virus-Scanned: amavisd-new at localhost Message-ID: <492A7CD5.5040504@solin.spb.ru> Date: Mon, 24 Nov 2008 13:07:17 +0300 From: Aleksey Avdeev User-Agent: Thunderbird 2.0.0.12 (X11/20080304) MIME-Version: 1.0 To: ALT Linux Team development discussions References: <774a4f4a0811240000n7067ba1bq75716b8b72348196@mail.gmail.com> <492A6DF3.6080906@solin.spb.ru> <774a4f4a0811240122w2e5a6166v8fb184b1245bc67b@mail.gmail.com> In-Reply-To: <774a4f4a0811240122w2e5a6166v8fb184b1245bc67b@mail.gmail.com> X-Enigmail-Version: 0.95.6 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="------------enigD3E1C7E62A33DE2AB227B6F5" Subject: Re: [devel] =?koi8-r?b?z9LHwc7J2sHDydEgZ2l0LdLF0M/aydTP0snRLCDTz8TF?= =?koi8-r?b?1sHdxcfPIM7F1MXL09TP19nFIMTBzs7ZxQ==?= 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: Mon, 24 Nov 2008 10:07:28 -0000 Archived-At: List-Archive: List-Post: This is an OpenPGP/MIME signed message (RFC 2440 and 3156) --------------enigD3E1C7E62A33DE2AB227B6F5 Content-Type: text/plain; charset=KOI8-R; format=flowed Content-Transfer-Encoding: quoted-printable Artem Zolochevskiy =D0=C9=DB=C5=D4: > 24.11.08, Aleksey Avdeev =CE=C1=D0=C9=D3=C1=CC(=C1):= >> Artem Zolochevskiy =D0=C9=DB=C5=D4: >>> hi all >>> >> ... >>> =F0=CF=C4=D3=CB=C1=D6=C9=D4=C5, =CB=C1=CB =CC=D5=DE=DB=C5 =CF=D2=C7=C1= =CE=C9=DA=CF=D7=C1=D4=D8 =D4=C1=CB=C7=CF =D2=CF=C4=C1 =D2=C5=D0=CF=DA=C9=D4= =CF=D2=C9=CA. >>> =ED=CF=C9=C8 =D0=CF=DA=CE=C1=CE=C9=CA =C8=D7=C1=D4=C1=C5=D4 =D4=CF=CC= =D8=CB=CF =C4=CC=D1 =D4=C1=CB=C9=C8 =D7=C1=D2=C9=C1=CE=D4=CF=D7: >>> 1. >>> =C4=C5=CC=C1=D4=D8 =CB=CF=CD=CD=C9=D4=D9 =CE=C1 =C9=DA=CD=C5=CE=C5=CE= =C9=D1 =D4=C5=CB=D3=D4=C1 =D3=D4=D2=CF=C7=CF =CF=D4=C4=C5=CC=D8=CE=CF. =E9= =D4=CF=C7=C4=C1 =D0=D2=C9 >>> =CE=C5=CF=C2=C8=CF=C4=C9=CD=CF=D3=D4=C9 =D7=CE=C5=D3=C5=CE=C9=D1 =DC=D4= =C9=C8 =C9=DA=CD=C5=CE=C5=CE=C9=CA =D7 =C4=D2=D5=C7=D5=C0 =D7=C5=D4=CB=D5= , =C4=C5=CC=C1=D4=D8 =D4=CF=DE=C5=DE=CE=D9=C5 >>> cherry-pick >>> 2. >>> =D7=D9=CE=C5=D3=D4=C9 =D3=C1=CD =D4=C5=CB=D3=D4 (=C2=C5=DA png) =D7 =CF= =D4=C4=C5=CC=D8=CE=D9=CA =C2=D2=C1=CE=DE: =CE=C1=D0=D2=C9=CD=C5=D2 upstre= am (=C8=CF=D4=D1 >>> =CD=CF=D6=CE=CF =C9 master). =F0=D2=C1=D7=C9=D4=D8 =C5=C7=CF =D4=C1=CD= =2E =F7 "=D0=C1=CB=C5=D4=CE=D9=C8" =C2=D2=C1=CE=DE=C1=C8 =D6=C5 (=CE=C1=D0= =D2=C9=CD=C5=D2 >>> =CE=C1=DA=CF=D7=A3=CD =C9=C8 office =C9 school) =C4=C5=D2=D6=C1=D4=D8= png-=DB=CB=C9 + =D0=C1=CB=C5=D4=CF=D3=C2=CF=D2=CF=DE=CE=CF=C5 >>> =C8=CF=DA=D1=CA=D3=D4=D7=CF =C9 =C4=C5=CC=C1=D4=D8 merge =D3 =C2=D2=C1= =CE=DE=C5=CD, =D3=CF=C4=C5=D2=D6=C1=DD=C9=CD =D4=C5=CB=D3=D4. =F4=CF=C7=C4= =C1 =CB=C1=D2=D4=C9=CE=CB=C9 >>> =CF=D3=D4=C1=C0=D4=D3=D1 =CE=C1 =D3=CF=D7=C9=C8 =CD=C5=D3=D4=C1=C8. >> =F1 =C2=D9 =D0=CF=DB=A3=CC =DC=D4=C9=CD =D0=D5=D4=A3=CD. =F0=D2=C9=DE= =A3=CD =D4. =CB. =D0=C1=CB=C5=D4=CF=D3=C2=CF=D2=CF=DE=CE=CF=C5 =C8=CF=DA=D1= =CA=D3=D4=D7=CF >> =CF=D4=CC=C9=DE=C1=C5=D4=D3=D1 =D7 =CF=D3=CE=CF=D7=CE=CF=CD =C9=CD=C5=CE= =C5=CD =D3=D0=C5=CB=C1 (=D3=C1=CD=C9 =D3=D0=C5=CB=C9 =C9=CD=C5=C0=D4 =CD=C9= =CE=C9=CD=C1=CC=D8=CE=CF=C5 >> =CF=D4=CC=C9=DE=C9=D1) -- =DA=C1=D7=A3=CC =C2=D9 =C4=CF=D0=CF=CC=CE=C9= =D4=C5=CC=D8=CE=D9=CA =C2=D2=C1=CE=DE =D3 =D0=C5=D2=C5=C9=CD=C5=CE=CF=D7=C1= =CE=CE=D9=CD =D3=D0=C5=CB=CF=CD (=DC=D4=CF >> =D0=CF=DA=D7=CF=CC=C9=D4 =C1=D7=D4=CF=CD=C1=D4=C9=DA=C9=D2=CF=D7=C1=D4= =D8 =CD=C5=D2=D6=C9). >=20 > =C1=C7=C1. =D0=CF=CE=D1=D4=CE=CF. > =D4=CF=CC=D8=CB=CF =D0=D2=CF =D3=D0=C5=CB =CE=C5 =C4=CF =CB=CF=CE=C3=C1= =2E =D0=D2=C5=C4=D0=CF=CC=C1=C7=C1=C5=D4=D3=D1 =C4=C5=D2=D6=C1=D4=D8 =C9=CD= =D1 =D3=D0=C5=CB=C1 > =CF=C4=C9=CE=C1=CB=CF=D7=D9=CD =C4=CC=D1 =C4=D7=D5=C8 =D0=C1=CB=C5=D4=CF= =D7? =EE=C5=D4. =F0=D2=C5=C4=CC=C1=C7=C1=C0 =C4=C5=D2=D6=C1=D4=D8 =D3=D0=C5= =C3=C9=C1=CC=D8=CE=CF =CF=C2=D5=DE=C5=CE=CE=D9=CA =C2=D2=C1=CE=DE =C4=CC=D1= =D0=C5=D2=C5=C9=CD=C5=CE=CF=D7=C1=CE=C9=CA=20 (=D3=CD. no-png/master-school =D7=20 ).=20 =E5=D3=CC=C9 =D7 =CE=A3=CD =D0=D2=CF=C9=DA=D7=CF=C4=C9=D4=D8 =D4=CF=CC=D8= =CB=CF =D0=C5=D2=C5=C9=CD=C5=CE=CF=D7=C1=CE=C9=C5 =C6=C1=CA=CC=CF=D7 -- =DC= =D4=CF =D7=C5=D3=D8=CD=C1=20 =D5=D0=D2=CF=D3=D4=C9=D4 pull. =EE=C1=D0=D2=C9=CD=C5=D2, =D0=CF=D3=CC=C5 = =D0=D2=C1=D7=CF=CB =D7 no-png/master: $ git checkout -f no-png/master-school $ git pull . no-png/master $ git checkout -f no-png/school $ git pull . no-png/master-school =EE=C1 =DC=D4=CF=CD =DC=D4=C1=D0=C5 =D7=CF=DA=CD=CF=D6=CE=D9 =CB=CF=CE= =C6=CC=C9=CB=D4=D9. =E9=C8 =CE=C1=C4=CF =C2=D5=C4=C5=D4 =D2=C1=DA=D2=C5=DB= =C9=D4=D8. $ git checkout -f school $ git pull . no-png/school >=20 >>> =EF=C4=CE=C9=CD =D3=CC=CF=D7=CF=CD, =D0=D2=CF=DB=D5 =D3=CF=D7=C5=D4=C1= =C2=D9=D7=C1=CC=D9=C8. >>> >>> =F0=CF=CB=C1 =CF=CE=CF =D7=CF=D4 =D7 =D4=C1=CB=CF=CD =D3=CF=D3=D4=CF=D1= =CE=C9=C9: >>> http://git.altlinux.org/people/azol/private/docs-install_office_serve= r.git >>> =F0=D2=CF=D3=D4=CF =CB=C1=CB =C4=D7=C1 =CF=D4=C4=C5=CC=D8=CE=D9=C8 =C2= =D2=C1=CE=DE=C1. >> =F0=D2=C1=D7=C9=CC=D8=CE=CF =D0=CF=CE=C9=CD=C1=C0 =DE=D4=CF, =D0=CF= =C6=C1=CB=D4=D5, school =C4=C5=CC=C1=CC=D3=D1 =CE=C1 =CF=D3=CE=CF=D7=C5 = master? >=20 > =C4=C1. =CE=CF =C4=C1=CC=D8=CE=C5=CA=DB=C9=C5 =D0=D2=C1=D7=CB=C9 =C2=D5= =C4=D5=D4 =D0=D2=CF=C9=DA=D7=CF=C4=C9=D4=D3=D1 =C9=CD=C5=CE=CE=CF =D0=CF = =CF=D4=CE=CF=DB=C5=CE=C9=C0 =CB > school =C9=C2=CF =CF=CE =CB=C1=CB =D2=C1=DA =D7 =D2=C1=C2=CF=D4=C5 =CE=C1= =C8=CF=C4=C9=D4=D3=D1. =D4=C1=CB =DE=D4=CF =D0=CF=D4=CF=CD =D0=D2=C9=C4=A3= =D4=D3=D1 =D0=CF > =C9=C4=C5=C5 =D7 =C4=D2=D5=C7=D5=C0 =D3=D4=CF=D2=CF=CE=D5 =C9=DA=CD=C5=CE= =C5=CE=C9=D1 =D0=C5=D2=C5=CE=CF=D3=C9=D4=D8 (=C9=DA school =D7 master). =F4=CF=C7=C4=C1 =D0=CF=D4=D2=C5=C2=D5=C5=D4=D3=D1 =C5=DD=A3 =CF=C4=C9=CE= =D4=C5=C8=CE=C9=DE=C5=D3=CB=C9=CA =C2=D2=C1=CE=DE, =DA=C1=D4=CF=DE=C5=CE= =CE=D9=CA =CE=C1 =CF=C2=D2=C1=D4=CE=CF=C5=20 =D0=C5=D2=C5=C9=CD=C5=CE=CF=D7=C1=CE=C9=C5: $ git checkout -b no-png/school-master no-png/school $ git mv docs-install_{school,office}_server.spec $ git commit ... =E9=D3=D0=CF=CC=D8=DA=CF=D7=C1=CE=C9=C5 =C1=CE=C1=CC=CF=C7=C9=DE=CE=CF= no-png/master-school. --=20 =F3 =D5=D7=C1=D6=C5=CE=C9=C5=CD. =E1=CC=C5=CB=D3=C5=CA. --------------enigD3E1C7E62A33DE2AB227B6F5 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 iQEcBAEBAgAGBQJJKnzaAAoJED0KZX1FX4J6O3wIAI1LAr1ultSUwhDR332SPo9Y TKP+0Y4Ug0AV2hkOKbx3bprq0w+AvcWS4pAB7XGOCqnKOjyCFfKnWJUHEc+vdZAj tEzq7djtw2mpLWAp9UZ3abpe0QIAyCaIKxY3+ByOUEuKKgzIwPFL8gPqvGKfV1em jLfCs0RhL8n+8LFqRuRHq0q9YhPp97UFM50K2Xq+MhiD/NKYUUmz4C2nZ0VDJqPY 6P7y9gD/21geWXy0xM9Io67baKvUlaOb6/YQ4AvZycAnoa4aaJ+i/hlEDcU1gbWV hRXIhox1PldRU33kmkTSOfsVXQhdhtlXECq6T1MDwwdjrx+MSXbNaiCkHIeySUU= =ecWz -----END PGP SIGNATURE----- --------------enigD3E1C7E62A33DE2AB227B6F5--