From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Date: Tue, 3 Jul 2007 21:08:15 +0400 From: "Dmitry V. Levin" To: ALT Devel discussion list Message-ID: <20070703170815.GE25385@basalt.office.altlinux.org> Mail-Followup-To: ALT Devel discussion list References: <20070702193052.GB15594@osdn.org.ua> <4689696F.7060205@altlinux.com> <20070703092835.GE21702@osdn.org.ua> <20070703093116.GF10014@basalt.office.altlinux.org> <468A5EC5.4020903@altlinux.com> <20070703143620.GA22712@cryo.net.ru> <468A805E.4070303@altlinux.com> <20070703170202.GA12944@cryo.net.ru> Mime-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="phCU5ROyZO6kBE05" Content-Disposition: inline In-Reply-To: <20070703170202.GA12944@cryo.net.ru> X-fingerprint: FE4C 93AB E19A 2E4C CB5D 3E4E 7CAB E6AC 9E35 361E Subject: Re: [devel] gear vs patches 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: Tue, 03 Jul 2007 17:08:15 -0000 Archived-At: List-Archive: List-Post: --phCU5ROyZO6kBE05 Content-Type: text/plain; charset=koi8-r Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Tue, Jul 03, 2007 at 09:02:02PM +0400, Pavlov Konstantin wrote: > On Tue, Jul 03, 2007 at 08:59:10PM +0400, Anton Farygin wrote: > > Pavlov Konstantin wrote: > > > On Tue, Jul 03, 2007 at 06:35:49PM +0400, Anton Farygin wrote: > > >> Dmitry V. Levin wrote: > > >>> On Tue, Jul 03, 2007 at 12:28:35PM +0300, Michael Shigorin wrote: > > >>>> On Tue, Jul 03, 2007 at 01:09:03AM +0400, Anton Farygin wrote: > > >>>>>> =EF, =CE=C1=D2=CF=C4 =D5=D6=C5 =CE=C1=DE=C1=CC =CE=C1=D3=D4=D5= =D0=C1=D4=D8 =CE=C1 =C7=D2=C1=C2=CC=C9 =CD=CF=CE=CF=CC=C9=D4=CE=D9=C8 =D0= =C1=D4=DE=C5=CA =C9=CC=C9=20 > > >>>>>> =CE=C5=C1=D0=D3=D4=D2=C9=CD=CE=D9=C8 =D4=C1=D2=C2=CF=CC=CF=D7 = =D2=CF=C4=CF=CD =C9=DA git. > > >>>>> =EC=C9=DE=CE=CF =CD=C5=CE=D1 =D7=D0=CF=CC=CE=C5 =D5=D3=D4=D2=C1= =C9=D7=C1=C5=D4 =D0=CF=C4=C8=CF=C4 =C9=DA =D0=C1=CB=C5=D4=C1 ImageMagick = =D3=20 > > >>>>> =CF=D2=C9=C7=C9=CE=C1=CC=D8=CE=D9=CD=C9 =D4=C1=D2=C2=CF=CC=CC=C1= =CD=C9 + =D0=C1=D4=DE=C1=CD=C9. > > >>>> =ED=CD=CD... =CB=C1=CB =D7=C1=D2=C9=C1=CE=D4, =C1 =DC=D4=CF =D3=CF= =C2=C9=D2=C1=C5=D4=D3=D1 gear? > > >>> =E4=C1, =CB=CF=CE=C5=DE=CE=CF, =D4=C1=CB =D2=C1=C2=CF=D4=C1=C5=D4 "= gear-srpmimport --no-unpack", > > >>> =CE=CF =D1 =CE=C1=D3=D4=CF=D1=D4=C5=CC=D8=CE=CF =D2=C5=CB=CF=CD=C5= =CE=C4=D5=C0 =C8=D2=C1=CE=C9=D4=D8 upstream'=CE=D9=C5 tar-=C1=D2=C8=C9=D7=D9 > > >>> =D7 =D2=C1=D3=D0=C1=CB=CF=D7=C1=CE=CE=CF=CD =D7=C9=C4=C5. > > >> =F0=CF=CB=C1 =CE=C5 =C2=D5=C4=C5=D4 =D0=CF=CE=D1=D4=C5=CE =CD=C5=C8= =C1=CE=C9=DA=CD =C4=C5=CA=D3=D4=D7=C9=D1 =D0=D2=C9 =D7=D9=C8=CF=C4=C5 =CE= =CF=D7=CF=CA =D7=C5=D2=D3=C9=C9 - =DC=D4=CF=20 > > >> unreal. > > >> > > >> =F7=CF=D4 =C5=D3=D4=D8 =D5 =CD=C5=CE=D1 =D4=C5=CB=D5=DD=C9=CA ImageM= agick, =D7=D9=DB=CC=C1 =CE=CF=D7=C1=D1 =D7=C5=D2=D3=C9=D1. =ED=CF=C9 =C4=C5= =CA=D3=D4=D7=C9=D1 ?=20 > > >> (=D1 =CE=C5 =C2=C5=D2=D5 ImageMagick =C9=DA =C9=C8 CVS, =C1 =D3=CB= =C1=DE=C9=D7=C1=C0 =D4=C1=D2=C2=CF=CC=CC). > > >=20 > > > =F3=CF=DA=C4=C1=CA =CF=D4=C4=C5=CC=D8=CE=D9=CA =C2=D2=C1=CE=DE (=CD= =CF=D6=CE=CF =C4=C1=D6=C5 =C9=DA =D4=D7=CF=C5=C7=CF master) =D4=CF=CC=D8=CB= =CF =D3 =D0=CF=C4=CB=C1=D4=C1=CC=CF=C7=CF=CD > > > ImageMagick =D0=D5=D4=C5=CD =D5=C4=C1=CC=C5=CE=C9=D1 =CF=D3=D4=C1=CC= =D8=CE=CF=C7=CF =C2=C1=D2=C1=C8=CC=C1. > > > =E4=C1=CC=C5=C5 =D7 master: git pull -s ours . upstream > > > =E4=C1=CC=C5=C5 =D7 upstream: =D7=CD=C5=D3=D4=CF =D3=D4=C1=D2=CF=C7= =CF =D0=CF=C4=CB=C1=D4=C1=CC=CF=C7=C1 ImageMagick =CB=CC=C1=C4=C5=CD =CE=CF= =D7=D9=CA =C9=DA > > > =CE=CF=D7=CF=C7=CF =D4=C1=D2=C2=CF=CC=CC=C1, =CB=CF=CD=C9=D4=D4=C9=CD= , =D0=C5=D2=C5=C8=CF=C4=C9=CD =D7 master =C9 =C4=C5=CC=C1=C5=CD pull =C9=DA= upstream. > > > =F0=D2=C1=D7=C9=CD =D3=D0=C5=CB =CE=C1 =D7=C5=D2=D3=C9=C9, =D0=C9=DB= =C5=CD =DE=C5=CE=C4=D6=CC=CF=C7, =CB=CF=CD=C9=D4=D4=C9=CD. =D3=CF=C2=C9=D2= =C1=C5=CD. > >=20 > > =EE=C5 =D0=CF=CE=D1=CC, =C1 =DE=D4=CF =C4=C5=CC=C1=D4=D8 =D3=CF =D3=D4= =C1=D2=D9=CD =CB=C1=D4=C1=CC=CF=C7=CF=CD ? =CB=C1=CB =D5=C4=C1=CC=D1=D4=D8/= =C4=CF=C2=C1=D7=CC=D1=D4=D8 =C6=C1=CA=CC=D9 ? >=20 > rm -rf ImageMagick > tar xf ImageMagick-newversion.tar.gz > mv ImageMagick-newversion ImageMagick > =D5=C2=D8=C5=CD =D5=C4=C1=CC=C5=CE=CE=D9=C5 =C6=C1=CA=CC=D9: > git-ls-files --deleted -z | git-update-index --remove --verbose -z --stdin > =C4=CF=C2=C1=D7=C9=CD =CE=CF=D7=CF=D0=CF=D1=D7=C9=D7=DB=C9=C5=D3=D1: > find ImageMagick -type f -print0 |xargs -0 git-update-index --add > =DA=C1=CB=CF=CD=C9=D4=D4=C9=CD, git-commit. >=20 > =E4=CC=D1 =D5=C4=C1=CC=C5=CE=C9=D1 =C6=C1=CA=CC=C1 -- git-rm, =C4=CC=D1 = =C4=CF=C2=C1=D7=CC=C5=CE=C9=D1 -- git-add >=20 > =F7 =D0=D2=C9=CE=C3=C9=D0=C5 =DC=D4=CF =CE=C1=D7=C5=D2=CE=CF =D7=D3=C5 = =C4=C5=CC=C1=C5=D4=D3=D1 gear-archive'=CF=CD, =CE=CF =D1 =D0=CF=CB=C1 =CE= =C5 =D3=CD=CF=D4=D2=C5=CC > =D7 =CE=C5=C7=CF. gear-update'=CF=CD. --=20 ldv --phCU5ROyZO6kBE05 Content-Type: application/pgp-signature Content-Disposition: inline -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.7 (GNU/Linux) iD8DBQFGioJ+fKvmrJ41Nh4RAtLZAJ9FuUmfTus45oXF33WEokWFVWXO2QCcD6N0 3zZQn30wBlCwIkOZPZ9Hd3k= =Z/fl -----END PGP SIGNATURE----- --phCU5ROyZO6kBE05--