From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Date: Sun, 4 Feb 2007 14:17:09 +0300 From: Sergey Vlasov To: devel@lists.altlinux.org Message-ID: <20070204111709.GC6351@procyon.home> Mail-Followup-To: devel@lists.altlinux.org References: MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="f0KYrhQ4vYSV2aJu" Content-Disposition: inline In-Reply-To: Subject: Re: [devel] gear - topic branches 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: Sun, 04 Feb 2007 11:17:28 -0000 Archived-At: List-Archive: List-Post: --f0KYrhQ4vYSV2aJu Content-Type: text/plain; charset=koi8-r Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Sun, Feb 04, 2007 at 12:10:11PM +0200, Nick S. Grechukh wrote: > =D3 =C7=C9=D4 =D2=C1=DA=CF=C2=D2=C1=CC=D3=D1, =D2=C1=DA=C2=C9=D2=C1=C0=D3= =D8 =D3 gear. =CB=C1=D6=C5=D4=D3=D1, =D7=D0=CF=CC=CE=C5 =D2=C5=C1=CC=D8=CE= =CF =C4=C5=D2=D6=C1=D4=D8 > =D3=D4=CF=D2=CF=CE=CE=C9=C5 =D0=C1=D4=DE=C9 =D7 =CF=D4=C4=C5=CC=D8=CE=D9= =C8 topic branch =C9 =CE=C1=D5=DE=C9=D4=D8 .gear-rules =C4=C5=CC=C1=D4=D8 > =C9=DA =CE=C9=C8 =C4=C9=C6=C6=D9. =F3 =DC=D4=C9=CD =C5=D3=D4=D8 =D4=CF=CC=D8=CB=CF =CF=C4=CE=C1 =D0=D2=CF=C2= =CC=C5=CD=C1, =C4=CC=D1 =CB=CF=D4=CF=D2=CF=CA =D3=CF=D7=C5=D2=DB=C5=CE=CE= =CF =CE=C5 =D7=C9=C4=CE=CF =D2=C5=DB=C5=CE=C9=D1: =DE=D4=CF =C4=C5=CC=C1=D4=D8, =C5=D3=CC=C9 =C9=DA=CD= =C5=CE=C5=CE=C9=D1, =D7=CE=CF=D3=C9=CD=D9=C5 =CE=C5=D3=CB=CF=CC=D8=CB=C9=CD= =C9 =D2=C1=DA=CC=C9=DE=CE=D9=CD=C9 =D0=C1=D4=DE=C1=CD=C9, =D0=C5=D2=C5=D3=C5=CB=C1=C0=D4=D3=D1? =F7 =CF=C2=DD= =C5=CD =D3=CC=D5=DE=C1=C5 =CD=CF=D6=C5=D4 =D0=CF=CE=C1=C4=CF=C2=C9=D4=D8=D3= =D1 =D0=D2=C9 =CF=C2=DF=C5=C4=C9=CE=C5=CE=C9=C9 =CE=C5=D3=CB=CF=CC=D8=CB=C9=C8 =C2=D2=C1= =CE=DE=C5=CA =C4=C5=CC=C1=D4=D8 =CE=C5=D4=D2=C9=D7=C9=C1=CC=D8=CE=D9=C5 =C9= =DA=CD=C5=CE=C5=CE=C9=D1 (=C4=C1=D6=C5 =D7 =D3=CC=D5=DE=C1=C5, =CB=CF=C7=C4=C1 =D1=D7=CE=D9=C8 =CB=CF=CE=C6=CC=C9=CB= =D4=CF=D7 =D7=D2=CF=C4=C5 =C2=D9 =CE=C5=D4 - =CE=C1=D0=D2=C9=CD=C5=D2, =CF= =C4=C9=CE =D0=C1=D4=DE =CD=CF=D6=C5=D4 =CD=C5=CE=D1=D4=D8 =CB=C1=CB=CF=CA-=D4=CF =C9=CE=D4=C5=D2= =C6=C5=CA=D3 =C9 =C9=D3=D0=D2=C1=D7=CC=D1=D4=D8 =CB=CF=C4, =C7=C4=C5 =DC=D4= =CF=D4 =C9=CE=D4=C5=D2=C6=C5=CA=D3 =C9=D3=D0=CF=CC=D8=DA=CF=D7=C1=CC=D3=D1, =C1 =C4=D2=D5=C7=CF=CA - =C4=CF=C2= =C1=D7=CC=D1=D4=D8 =CE=CF=D7=D9=CA =CD=CF=C4=D5=CC=D8, =D0=CF=CC=D8=DA=D5= =C0=DD=C9=CA=D3=D1 =DC=D4=C9=CD =C9=CE=D4=C5=D2=C6=C5=CA=D3=CF=CD; =D7 =DC=D4=CF=CD =D3=CC=D5=DE=C1=C5 =D0= =D2=C9 =CF=C2=DF=C5=C4=C9=CE=C5=CE=C9=C9 =DC=D4=C9=C8 =D0=C1=D4=DE=C5=CA = =D0=CF=D4=D2=C5=C2=D5=C5=D4=D3=D1 =CD=CF=C4=C9=C6=C9=C3=C9=D2=CF=D7=C1=D4=D8 =C9 =DC=D4=CF=D4 =CE=CF=D7=D9=CA= =CD=CF=C4=D5=CC=D8). > =CE=C5=D0=CF=CE=D1=D4=CE=CF =D3=C5=CA=DE=C1=D3 =D2=CF=D7=CE=CF =CF=C4=CE= =CF: >=20 > =D0=D5=D3=D4=D8 =D7 =C2=D2=C1=CE=DE=C5 upstream =CC=C5=D6=C9=D4 xmms-1.2.= 1. =C9=DA =CE=C5=C7=CF =D1 =C4=C5=CC=C1=C0 =C2=D2=C1=CE=DE > rusxmms =C9 =DE=C5=D2=C5=DA patch < rusxmms.patch =D0=D2=C9=CB=CC=C1=C4= =D9=D7=C1=C0. > =D7 master =D1 =C4=C5=CC=C1=C0 pull . upstream, =C9 =D7 .gear-rules =C7= =CF=D7=CF=D2=C0 =C4=C5=CC=C1=D4=D8 =C4=C9=C6=C6 > upstream-rusxmms. =C9=CC=C9 master-rusxmms? =D7 .src.rpm =CF=CE=CF =CC=C5= =D6=C9=D4 =CF=D4=C4=C5=CC=D8=CE=D9=CD > =D0=C1=D4=DE=C5=CD. =CF=D4=CC=C9=DE=CE=CF. =EF=D4=C4=C5=CC=D8=CE=D9=CD =D0=C1=D4=DE=C5=CD =CE=C5 =D0=CF=CC=D5=DE=C9=D4= =D3=D1 (=D2=C1=DA=D7=C5 =DE=D4=CF =DC=D4=CF=D4 =C2=D2=C1=CE=DE =D4=C1=CD = =C5=C4=C9=CE=D3=D4=D7=C5=CE=CE=D9=CA, =C9 =DA=C1=D7=C5=C4=A3=CE =D4=CF=CC=D8=CB=CF =D3 =C3=C5=CC=D8=C0 =CE=C5 =CB= =CC=C1=D3=D4=D8 =C6=C1=CA=CC=D9 =D4=C9=D0=C1 .gear-rules =C9 *.spec =D7 =C4=C9=C6=C6). =F7 =CF=C2=DD=C5=CD =D3=CC=D5=DE=C1=C5 =D0=CF=CC=D5=DE=C9= =D4=D3=D1 =D4=CF=CC=D8=CB=CF =CF=C4=C9=CE =D0=C1=D4=DE =D3=CF =D7=D3=C5=CD= =C9 =C9=DA=CD=C5=CE=C5=CE=C9=D1=CD=C9 (=CE=C1=D0=D2=C9=CD=C5=D2, diff: @version@:. .). > =D7 =CB=C1=CB=CF=CA-=D4=CF =CD=CF=CD=C5=CE=D4 git fetch upstream =D7=D9= =D4=D1=C7=C9=D7=C1=C5=D4 =CD=CE=C5 1.2.3. =DE=D4=CF =D1 > =C4=CF=CC=D6=C5=CE =D3=C4=C5=CC=C1=D4=D8 - > git checkout master =C9 =CF=D0=D1=D4=D8 git pull . upstream ? =C1 =DE=D4= =CF =D0=CF=D4=CF=CD =C4=C5=CC=C1=D4=D8 =D3 > =C2=D2=C1=CE=DE=C5=CD rusxmms - rebase =DE=D4=CF =CC=C9? =C9=CE=C1=DE=C5 = =D7=C5=C4=D8 =C4=C9=C6=C6 =C2=D5=C4=C5=D4 =D3=CF=C4=C5=D2=D6=C1=D4=D8 =CF= =D4=CB=C1=D4 > =D3 upstream-1.2.3 =C4=CF rusxmms-1.2.1. =FA=C1=D7=C9=D3=C9=D4 =CF=D4 =D4=CF=C7=CF, =DE=D4=CF =D0=D2=CF=C9=DA=CF=DB= =CC=CF =D3 =D0=C1=D4=DE=C5=CD =C9 =C1=D0=D3=D4=D2=C9=CD=CF=CD. =EE=C1=D0= =D2=C9=CD=C5=D2, =CD=CF=D6=CE=CF =D0=D2=CF=D3=D4=CF =D3=CD=C5=D2=D6=C9=D4=D8 =CE=CF=D7=D5=C0 =D7=C5=D2=D3=C9= =C0 =C1=D0=D3=D4=D2=C9=CD=C1 =D7 =DC=D4=CF=D4 =C2=D2=C1=CE=DE - =D4=C1=CB = =C9=CD=C5=C5=D4 =D3=CD=D9=D3=CC =D3=C4=C5=CC=C1=D4=D8, =C5=D3=CC=C9 =CF=C2=CE=CF=D7=CC=A3=CE=CE=CF=C7=CF = =D0=C1=D4=DE=C1 =C4=CC=D1 =DC=D4=CF=CA =D7=C5=D2=D3=C9=C9 =C1=D0=D3=D4=D2= =C9=CD=C1 =D0=CF=CB=C1 =CE=C5 =D3=D5=DD=C5=D3=D4=D7=D5=C5=D4. =E5=D3=CC=C9 =D6=C5 =C5=D3=D4=D8 =CE=CF=D7= =D9=CA =D0=C1=D4=DE, =CD=CF=D6=CE=CF =CF=D4=CB=C1=D4=C9=D4=D8 =D7 =C2=D2=C1= =CE=DE=C5 =CB=CF=CD=CD=C9=D4, =CE=C1=CB=CC=C1=C4=D9=D7=C1=D7=DB=C9=CA =D0=D2=C5=C4=D9=C4=D5=DD=D5=C0 =D7= =C5=D2=D3=C9=C0 =D0=C1=D4=DE=C1 (=DE=D4=CF=C2=D9 =CE=C5 =D7=CF=DA=C9=D4=D8= =D3=D1 =D3 =CB=CF=CE=C6=CC=C9=CB=D4=C1=CD=C9, =CB=CF=D4=CF=D2=D9=C5 =D7=D3=A3 =D2=C1= =D7=CE=CF =D5=D3=D4=D2=C1=CE=C5=CE=D9 =D7 =CE=CF=D7=CF=CD =D0=C1=D4=DE=C5),= =D3=CD=C5=D2=D6=C9=D4=D8 =CE=CF=D7=D5=C0 =D7=C5=D2=D3=C9=C0 (=D7 =C4=C1=CE=CE=CF=CD =D3=CC=D5=DE=C1= =C5 =DC=D4=CF =C2=D5=C4=C5=D4 trivial merge), =D0=CF=D3=CC=C5 =DE=C5=C7=CF =CE=C1=CC=CF=D6=C9=D4=D8 =CF=C2=CE=CF=D7=CC=A3=CE=CE=D9=CA =D0=C1=D4=DE. =F3=D2=C1=DA=D5 =CD=C5=D2=D6=C9=D4=D8 =CE=CF=D7=D5=C0 =D7=C5=D2=D3=C9=C0 = =C1=D0=D3=D4=D2=C9=CD=C1 =D7 master =D7 =D0=D2=C9=CE=C3=C9=D0=C5 =CE=C5=CF= =C2=D1=DA=C1=D4=C5=CC=D8=CE=CF (=C9=CE=C1=DE=C5 =D0=D2=C9 =CE=C1=CC=C9=DE=C9=C9 =CB=CF=CE=C6=CC=C9=CB=D4= =CF=D7 =C9=C8 =D7=D3=C5 =D0=D2=C9=C4=A3=D4=D3=D1 =D2=C1=DA=C7=D2=C5=C2=C1= =D4=D8 =CF=C4=CE=CF=CA =C2=CF=CC=D8=DB=CF=CA =CB=D5=DE=C5=CA). =F7=CF=DA=CD=CF=D6=CE=CF, =D0=D2=C9=C4=A3=D4=D3=D1 =D3= =CE=C1=DE=C1=CC=C1 =D7=D9=DB=C5=CF=D0=C9=D3=C1=CE=CE=D9=CD =D3=D0=CF=D3=CF= =C2=CF=CD =D0=C5=D2=C5=D7=C5=D3=D4=C9 =D7=D3=C5 =C2=D2=C1=CE=DE=C9 =CE=C1 =CE=CF=D7=D5=C0 =D7=C5=D2=D3=C9=C0, =D0= =CF=D4=CF=CD =D3=CD=C5=D2=D6=C9=D4=D8 =CE=D5=D6=CE=D9=C5 =C2=D2=C1=CE=DE=C9= =D7 =CB=C1=CB=CF=CA-=D4=CF newmaster, =C9 =D4=CF=CC=D8=CB=CF =D0=CF=D4=CF=CD =CD=C5=D2=D6=C9=D4=D8 =DC= =D4=CF=D4 newmaster =D7 master. --f0KYrhQ4vYSV2aJu Content-Type: application/pgp-signature; name="signature.asc" Content-Description: Digital signature Content-Disposition: inline -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.6 (GNU/Linux) iD8DBQFFxcC1W82GfkQfsqIRArWRAJ90nVzsYTAUhQuK5uv4fIGFB4xSqwCfQz0a ja3tqGXKRDyZ+IDERxJ/F70= =j6NR -----END PGP SIGNATURE----- --f0KYrhQ4vYSV2aJu--