From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Date: Sun, 4 Feb 2007 13:40:47 +0300 From: "Dmitry V. Levin" To: ALT Devel discussion list Message-ID: <20070204104047.GC18849@basalt.office.altlinux.org> Mail-Followup-To: ALT Devel discussion list References: Mime-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="aT9PWwzfKXlsBJM1" Content-Disposition: inline In-Reply-To: X-fingerprint: FE4C 93AB E19A 2E4C CB5D 3E4E 7CAB E6AC 9E35 361E 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 10:40:47 -0000 Archived-At: List-Archive: List-Post: --aT9PWwzfKXlsBJM1 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: [...] > =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. > =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, =C5=D3=D4=D8 =CC=C9 =D5 rusxmms.= patch =D3=D7=CF=CA upstream. 1. =E5=D3=CC=C9 =C5=D3=D4=D8, =D4=CF =C9=CD=C5=C5=D4 =D3=CD=D9=D3=CC =DA=C1= =D7=C5=D3=D4=C9 =C2=D2=C1=CE=DE upstream-rusxmms, =CB=CF=D4=CF=D2=D9=CA =C2= =D5=C4=C5=D4 =D7 =CB=C1=D6=C4=D9=CA =CD=CF=CD=C5=CE=D4 =D7=D2=C5=CD=C5=CE=C9 =D0=D2=CF= =D3=D4=CF upstream+rusxmms.patch. =F4=CF=C7=C4=C1 =D7 =C2=D2=C1=CE=DE master =CE=C1=C4=CF =C2=D5=C4=C5=D4 =C4=C5=CC=C1=D4=D8 pull =C9=CD=C5=CE=CE= =CF=C7=CF =C9=DA =C2=D2=C1=CE=DE=C1 upstream-rusxmms, =C1 =CE=C5 =C9=DA =C2=D2=C1=CE=DE=C1 upstream. =F0=D2=C9 =DC=D4=CF=CD =CE=C1=C4=CF =D0=D2=C9= =C4=D5=CD=C1=D4=D8 =D5=C4=CF=C2=CE=D9=CA =D3=D0=CF=D3=CF=C2 =CF=C2=CE=CF=D7= =CC=C5=CE=C9=D1 =C2=D2=C1=CE=DE=C1 upstream-rusxmms =D0=D2=C9 =CF=C2=CE=CF=D7=CC=C5=CE=C9=C9 =C2=D2=C1=CE=DE= =C1 upstream =C9 rusxmms.patch, =DE=D4=CF=C2=D9 =C5=DD=A3 =C9 =CE=C1=D3=CC=C5=C4=CF=D7=C1=CE=C9=C5 =C2=D9=CC=CF =D0=D2=C1= =D7=C9=CC=D8=CE=CF=C5. vsu@, =D0=CF=C4=C5=CC=C9=D3=D8 =CF=D0=D9=D4=CF=CD! 2. =E5=D3=CC=C9 =CE=C5=D4, =D4=CF =D7=D3=A3 =D2=C1=D7=CE=CF =C9=CD=C5=C5=D4= =D3=CD=D9=D3=CC =DA=C1=D7=C5=D3=D4=C9 =C2=D2=C1=CE=DE upstream-rusxmms, =D7 =CB=CF=D4=CF=D2=D9=CA =CE=C1=C4=CF =C2=D5=C4=C5=D4 =C4=C5=CC=C1=D4=D8 p= ull =C9=CD=C5=CE=CE=CF =C9=DA =C2=D2=C1=CE=DE=C1 upstream, =C1 =D7 =C2=D2= =C1=CE=DE master -- pull =C9=DA =C2=D2=C1=CE=DE=C1 upstream-rusxmms. --=20 ldv --aT9PWwzfKXlsBJM1 Content-Type: application/pgp-signature Content-Disposition: inline -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.5 (GNU/Linux) iD8DBQFFxbgvfKvmrJ41Nh4RAor8AJ9FmDyzlpKRl/dbrOF1nqReUy1ZmgCcCcnp csP0+5UGaJTuUMXqmMM7a8k= =B9mc -----END PGP SIGNATURE----- --aT9PWwzfKXlsBJM1--