From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Date: Wed, 4 Apr 2007 14:35:11 +0400 From: Alexey Tourbin To: ALT Devel discussion list Message-ID: <20070404103510.GI30995@solemn.turbinal> Mail-Followup-To: ALT Devel discussion list References: <20070403220452.GE30995@solemn.turbinal> <4612CC02.1090400@solin.spb.ru> <20070404092009.GH30995@solemn.turbinal> <46136F22.6040106@solin.spb.ru> Mime-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="dwWFXG4JqVa0wfCP" Content-Disposition: inline In-Reply-To: <46136F22.6040106@solin.spb.ru> Subject: Re: [devel] =?koi8-r?b?ZWxpbmtzLmdpdCDQxdLFyM/EIM7BIM7P19nKIMLSwc7e?= 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: Wed, 04 Apr 2007 10:35:21 -0000 Archived-At: List-Archive: List-Post: --dwWFXG4JqVa0wfCP Content-Type: text/plain; charset=koi8-r Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Wed, Apr 04, 2007 at 01:25:54PM +0400, Aleksey Avdeev wrote: > > =F5 =CD=C5=CE=D1 =D3=CC=C9=DB=CB=CF=CD =CD=CE=CF=C7=CF =C9=DA=CD=C5=CE= =C5=CE=C9=CA =D7 =CD=CF=C5=CD =C2=D2=C1=CE=DE=C5, =CB=CF=D4=CF=D2=D9=CA =D4= =C5=D3=CE=CF =D0=D2=C9=D7=D1=DA=C1=CE > > =CB elinks-0.11. =F0=C1=D4=DE=C5=D7 =CF=D4=C4=C5=CC=D8=CE=CF =CE=C5 = =C4=C5=D2=D6=D5. =ED=CF=D6=C5=D4 =C2=D9=D4=D8 rebase =C4=C1=D3=D4 =CD=C5= =CE=D8=DB=C5 > > =CB=CF=CE=C6=CC=C9=CB=D4=CF=D7. >=20 > =ED=CF=D6=CE=CF =D0=CF=D0=D2=CF=C2=CF=D7=C1=D4=D8... =ED=C5=CE=D1 =DA= =C4=C5=D3=D8 git-cherry-pick, =D7=D9=D0=CF=CC=CE=D1=C5=CD=D9=C5 =D2=C1=CE= =C5=C5, > =CE=C1=D3=D4=CF=D2=C1=D6=C9=D7=C1=C0=D4: =C5=D3=CC=C9 =D0=D2=C1=D7=C9=CC= =D8=CE=CF =D0=CF=CE=C9=CD=C1=C0 -- =CF=CE=CF =D3=D7=D1=DA=C9 =D2=CF=C4=C9= =D4=C5=CC=D8-=D0=CF=D4=CF=CD=CF=CB =CE=C5 > =CF=D3=D4=C1=D7=CC=D1=C5=D4, =DE=D4=CF =CD=CF=D6=C5=D4 =D7=D9=DA=D7=C1=D4= =D8 =D3=CC=CF=D6=CE=CF=D3=D4=C9 =D0=D2=C9 rebase... (=EE=CF =D0=CF=C8=CF=D6= =C5 -- =DC=D4=CF=D4 > =CB=D7=C5=D3=D4 =D7=D3=A3 =D2=C1=D7=CE=CF =D0=D2=C9=C4=A3=D4=D3=D1 =D0=D2= =CF=CA=D4=C9...) >=20 > > =EE=CF =D7=C5=C4=D8 =CE=D5=D6=CE=CF =CB=C1=CB-=D4=CF =C5=DD=A3 =C9=CD= =C5=D4=D8 =D7 =CB=C1=DE=C5=D3=D4=D7=C5 common ancestor > > =D0=CF=D3=CC=C5=C4=CE=C9=CA =D4=C1=C7 0.11.2-alt1. =E9=CC=C9 =CE=C5 = =CE=D5=D6=CE=CF? >=20 > =EB=C1=D6=C5=D4=D3=D1 =D1 =DA=C1=D0=D5=D4=C1=CC=D3=D1. =FE=D4=CF =C9=CD= =C5=CE=CE=CF =C9=CD=C5=C5=D4=D3=D1 =D7 =D7=C9=C4=D5: =F4=CF=DE=CB=C1 =D7=C5= =D4=D7=CC=C5=CE=C9=D1 =D7=C1=DB=C5=C7=CF > =C2=D2=C1=CE=DE=C1 =CF=D4 =C1=D0=D3=D4=D2=C9=CD=C1? =F0=D2=C9=CC=CF=D6=C9=CC =D3=CB=D2=C9=CE=DB=CF=D4. =F1 =D2=C1=C2=CF=D4=C1=C0 =D3 =C2=D2=C1=CE=DE=C5=CD elinks-0.11 (=CE=C1 =D2= =C9=D3=D5=CE=CB=C5 =CF=CE =C4=CF =CB=CF=CE=C3=C1 =CE=C5 =D0=CF=CB=C1=DA=C1= =CE, =C1 =CB=CF=CE=DE=C1=C5=D4=D3=D1 =CE=C1 =D4=C5=C7=C5 elinks-0.11.2). =E1 =D4=D5= =C4=C1 =D7=D7=C5=D2=C8 =C9=C4=C5=D4 =C4=D2=D5=C7=CF=CA =C2=D2=C1=CE=DE -- =CF=CE =CE=C1=DA=D9=D7=C1=C5=D4=D3=D1 origin, =CE=C1=DE=C9=CE=C1=D1 =D3 =CB= =CF=CD=CD=C9=D4=C1 elinks-0.12.GIT. =EF=C2=DD=C9=CA =D0=D2=C5=C4=CF=CB =D5 =DC=D4=C9=C8 =C2=D2=C1=DE=C5=CA -- elinks-0.11.0. =EF=CE =D4=C1=CD =C7= =CC=D5=C2=CF=CB=CF =D7=CE=C9=DA=D5. =E9=DA =D2=C9=D3=D5=CE=CB=C1 =D7=C9=C4=CE=CF, =DE=D4=CF =D1 =CB=D2=C5=D0=CB= =CF =D0=D2=C9=D7=D1=DA=C1=CE =CB =C2=D2=C1=CE=DE=D5 elinks-0.11, =D4.=C5. = =D1 =D7=CE=CF=D3=C9=CC =D3=D7=CF=C9 =C9=DA=CD=C5=CE=C5=CE=C9=D1, =D0=CF=D4=CF= =CD pull, =D0=CF=D4=CF=CD =CF=D0=D1=D4=D8 =D7=CE=CF=D3=C9=CC =D3=D7=CF=C9 = =C9=DA=CD=C5=CE=C5=CE=C9=D1, =D0=CF=D4=CF=CD =D0=CF=D1=D4=D8 pull, =C9 =D4.=C4. =F4=C5=D0=C5=D2=D8 =D1 =C8=CF=DE=D5 =C4=C5=CC=C1=D4=D8 =CE=CF=D7=D5=C0 =D3= =C2=CF=D2=CB=D5 =CE=C1 =CF=D3=CE=CF=D7=C5 =C2=D2=C1=CE=DE=C1 elinks-0.12.GI= T, =CB=CF=D4=CF=D2=D9=CA =D5=C8=CF=C4=C9=D4 =D4=D5=C4=C1 =D7=D7=C5=D2=C8 "=D7 = =C2=C5=D3=CB=CF=CE=C5=DE=CE=CF=D3=D4=D8". =EE=C1=C9=D7=CE=D9=CA pull =D4=D5=D4 =D3=C4=C5=CC=C1=D4=D8 =CF=DE=C5=CE=D8 = =D0=D2=CF=C2=CC=C5=CD=CE=CF. =ED=CF=D6=CE=CF =D0=CF=D0=D2=CF=C2=CF=D7=C1= =D4=D8 =D0=C5=D2=C5=C2=C1=DA=C9=D2=CF=D7=C1=D4=D8 =D7=D3=C5 =D3=D7=CF=C9 =C9=DA=CD= =C5=CE=C5=CE=C9=D1 =CE=C1 =C2=D2=C1=CE=DE elinks-0.12.GIT, =CE=C5 =D4=CF =D3 =D0=CF=CD=CF=DD=D8=C0 git-rebase, =CE=C5 =D4=CF =D3 =D0= =CF=CD=CF=DD=D8=C0 cherry-pick. =EE=CF =D7=CF=DA=CE=C9=CB=C1=C5=D4 =D7=CF=D0=D2=CF=D3: =CE=D5=D6=CE=CF =CC= =C9 =C4=C5=CC=C1=D4=D8 merge =D3=CF =D3=D4=C1=D2=D9=CD =C2=D2=C1=CE=DE=C5= =CD master, =C8=CF=D4=D1 =C2=D9 =C9 =C6=C9=CB=D4=C9=D7=CE=D9=CA? =E6=C9=CB=D4=C9=D7=CE= =D9=CA merge =D7=C5=C4=D8 =D4=CF=D6=C5 =DE=D2=C5=D7=C1=D4 =D0=CF=D3=CC=C5= =C4=D3=D4=D7=C9=D1=CD=C9: git =C2=D5=C4=C5=D4 =C4=D5=CD=C1=D4=D8, =DE=D4=CF =CB=C1=CB=C9=C5-=D4=CF = =CC=C5=D7=D9=C5 =C9=DA=CD=C5=CE=C5=CE=C9=D1 =D4=C1=CD =D4=C5=D0=C5=D2=D8 = =C5=D3=D4=D8, =C1 =CE=C1 =D3=C1=CD=CF=CD =C4=C5=CC=C5 =D4=C1=CD =C9=C8 =CE=C5=D4. =E9=CC=C9 git =C4= =CF=D3=D4=C1=D4=CF=DE=CE=CF =C8=C9=D4=C5=D2 =C4=CC=D1 =D4=CF=C7=CF, =DE=D4= =CF=C2=D9 =D2=C1=D3=D0=CF=DA=CE=C1=D4=D8 =D0=D2=C9=CD=C5=CE=C5=CE=C9=C5 =CC=C5=D7=CF= =CA =D3=D4=D2=C1=D4=C5=C7=C9=C9 ours? --dwWFXG4JqVa0wfCP Content-Type: application/pgp-signature Content-Disposition: inline -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.7 (GNU/Linux) iD8DBQFGE39efBKgtDjnu0YRAgU6AJsG5fP24jLIHnp4IdQFGonuYa5WvQCfYPki QdBHO1KBPLX9qyukcwj6agE= =BJ69 -----END PGP SIGNATURE----- --dwWFXG4JqVa0wfCP--