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_40,DNS_FROM_OPENWHOIS, SPF_PASS autolearn=no version=3.2.5 Date: Sat, 5 Mar 2011 00:30:20 +0300 From: Afanasov Dmitry To: devel@lists.altlinux.org Message-ID: <20110304213017.GA11583@eno.ender.rk> Mail-Followup-To: devel@lists.altlinux.org References: <4D6C910A.3020905@altlinux.ru> <20110303183007.GA5452@mw.mithraen.ru> <20110303203115.GA17404@utvuk.ender.rk> <201103042325.36743.lav@etersoft.ru> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="RnlQjJ0d97Da+TV1" Content-Disposition: inline In-Reply-To: <201103042325.36743.lav@etersoft.ru> User-Agent: Mutt/1.5.21 (2010-09-15) Subject: Re: [devel] =?koi8-r?b?W0pUXSDT1MnMySDXxcTFzsnRICAgIGdlYXIgcmVwbw==?= X-BeenThere: devel@lists.altlinux.org X-Mailman-Version: 2.1.12 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: Fri, 04 Mar 2011 21:23:59 -0000 Archived-At: List-Archive: List-Post: --RnlQjJ0d97Da+TV1 Content-Type: text/plain; charset=koi8-r Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Fri, Mar 04, 2011 at 11:25:36PM +0300, Vitaly Lipatov wrote: > On 3 =CD=C1=D2=D4=C1 2011, Afanasov Dmitry wrote: > ... > > =DC=D4=C1 =D3=C9=D3=D4=C5=CD=C1 =CF=DE=C5=CE=D8 =D3=CD=C5=DB=CE=CF =D3= =CD=CF=D4=D2=C9=D4=D3=D1 =D0=CF=D3=CC=C5 git clone > > git.alt:/gears. =D3=CD=CF=D4=D2=C9=DB=D8 git log, =C1 =D4=C1=CD =D4=CF = =C5=D3=D4=D8 =C9=C8=CF=C4=CE=C9=CB=C9, =D4=CF > > =C9=C8 =CE=C5=D4=D5 - =CD=C9=D3=D4=C9=CB=C1! =D0=D2=C9=C8=CF=C4=C9=D4= =D3=D1 =CD=C1=CE=D5 =CE=C1 =CC=C9=DB=CE=C9=CA =CB=C1=D3=D4 $ cat > > .gear/tag/list =C4=C5=CC=C1=D4=D8 =C9 =D5=D6=C5 =D0=CF=D4=CF=CD checkou= t -b. > =E4=CD=C9=D4=D2=C9=CA, =C1 =CD=CF=D6=CE=CF =D0=CF=C4=D2=CF=C2=CE=C5=C5? = =ED=C5=CE=D1 =D7=D3=C5=C7=C4=C1 =D0=D2=C9=D7=CF=C4=D1=D4 =D7 =CE=C5=C4=CF= =D5=CD=C5=CE=C9=C5=20 > =D4=C1=CB=C9=C5 =D2=C5=D0=CF=DA=C9=D4=CF=D2=C9=C9, =C9 =D1 =CE=C5 =D0=CF= =CE=C9=CD=C1=C0, =DE=D4=CF =D3 =CE=C9=CD=C9 =C4=C5=CC=C1=D4=D8, =DE=D4=CF= =C2=D9,=20 > =C4=CF=D0=D5=D3=D4=C9=CD, =CF=C2=CE=CF=D7=C9=D4=D8 =C4=CF =D3=CC=C5=C4=D5= =C0=DD=C5=CA =D7=C5=D2=D3=C9=C9. =ED=CE=C5 =CB=C1=D6=C5=D4=D3=D1, =D3=CC=C9= =DB=CB=CF=CD=20 > =CD=CE=CF=C7=CF =C4=C5=CA=D3=D4=D7=C9=CA. =EE=C1 http://altlinux.org =CE= =C5 =CE=C1=DB=A3=CC. =CE=D5, =C5=D3=D4=D8 =C4=D7=C1 =D3=D0=CF=D3=CF=C2=C1. 1. qgit. =C4=CF =CB=CF=CD=CD=C9=D4=C1 Merge branch 'upstream' =D7=C9=C4=CE= =D9 =C4=D7=C1 =CB=CF=CD=CD=C9=D4=C1. =D0=D2=C1=D7=C4=C1 =CB=D4=CF =C9=DA =CE=C9=C8 master, =C1 =CB=D4=CF upstream =D7 qgit =CE=C5 =D7=C9=C4= =CE=CF, =CE=D5=D6=C5=CE =CF=D2=C9=C7=C9=CE=C1=CC=D8=CE=D9=CA =D2=C5=D0=CF=DA=C9=D4=C1=D2=C9=CA. =CE=CF =CD=CF=D6=CE=CF =D7=CF=D3=D3=D4= =C1=CE=CF=D7=C9=D4=D8 =DE=C9=D3=D4=CF =CC=CF=C7=C9=CB=CF=CA: checkout =CC= =C5=D7=D9=CA =C9 checkout =D0=D2=C1=D7=D9=CA. =C7=C4=C5 .gear - =D4=CF=D4 master, =C7=C4=C5 = =CE=C5=D4 - =D4=CF=D4 upstream. =DC=D4=CF =C5=D3=CC=C9 =CE=C5 =C4=C1=CA =C2=CF=C7 git merge =C2=D9=CC =D3=C4=C5=CC=C1=CE =D4=CF=CC= =D8=CB=CF =D0=CF =C4=D7=D5=CD =C2=D2=C1=CE=DE=C1=CD. 2. .gear/tags/list. =D7 =CE=C1=DB=C5=CD =D3=CC=D5=DE=C1=C5 =CF=CE =D3=CF=C4= =C5=D2=D6=C9=D4=20 ce98d62eb52bb76d9bc8f8b21969ffe078330c5f upstream =DC=D4=CF=D4 hash =D7 qgit =CB=C1=CB =D2=C1=DA =CF=C4=C9=CE =C9=DA =D0=D2= =C5=C4=CB=CF=D7 Merge branch 'upstream'. =D2=C1=C4=D5=C5=CD=D3=D1, =DE=D4=CF =D5 =CE=C1=D3 =D4=D5=D4 =C2=D2=C1=CE=DE= , =C1 =CE=C5 =D4=C5=C7, =CB=C1=CB =CB =D0=D2=C9=CD=C5=D2=D5 =D5 =CD=C5=CE= =D1 =C9 =C4=C5=CC=C1=C5=CD git checkout -b upstream ce98d62eb52bb76d9bc8f8b21969ffe078330c5f =C1 =C4=C1=CC=D8=DB=C5 =D4=D2=C9=D7=C9=C1=CC=D8=CE=CF: gear-update .; git checkout master; git merge -s ours upstream; gear-update-tag -avc =C5=D3=CC=C9 =DA=C1=C2=D9=D4=D8 -s ours, =D4=CF =C9=D3=C8=CF=C4=CE=C9=CB=C9= =D0=CF=D1=D7=D1=D4=D3=D1 master. =CB=CF=C7=C4=C1-=D4=CF =CD=CE=C5 =DA=C4=C5=D3=D8 =D6=C5 =D3=CB=C1=DA=C1=CC= =C9, =DE=D4=CF gear =C8=D2=C1=CE=C9=D4 =D7=D3=C0 =CE=C5=CF=C2=C8=CF=C4=C9= =CD=D5=C0 =C9=CE=C6=CF=D2=CD=C1=C3=C9=C0 =C4=CC=D1 =D3=C2=CF=D2=CB=C9, =C1 =DA=CE=C1=DE=C9=D4 =C9 =D4=C5=C7=C9 =C9= =D3=C8=CF=C4=CE=C9=CB=CF=D7, =CB=CF=D4=CF=D2=D9=C5 =CF=CE =C8=D2=C1=CE=C9= =D4 =D7 .gear/tags. =CB =D3=CF=D6=C1=CC=CE=C9=C0, gears =C8=D2=C1=CE=C9=D4 =C9=CE=C6=D5 =D4=CF=CC= =D8=CB=CF =C4=CC=D1 =D3=C2=CF=D2=CB=C9, =C4=CC=D1 =CF=C2=CE=CF=D7=CC=C5=CE= =C9=D1 =D6=C5 =C5=A3 =D0=D2=C9=C8=CF=C4=C9=D4=D3=D1 =D7=D9=DE=C9=D3=CC=D1=D4=D8, =CF=D3=CF=C2=C5= =CE=CE=CF =D7 =D3=CC=D5=DE=C1=C8 =D3 -s ours =C9 -s subtree. =CE=C9=DE=C5=C7=CF =D3=D4=D2=C1=DB=CE=CF=C7=CF, =D0=D2=CF=D3=D4=CF =D5=D4= =C9=CC=C9=D4=C1, =CF=C2=CC=C5=C7=DE=C1=C0=DD=C1=D1 =D2=C1=C2=CF=D4=D5, =D4= =D2=C1=D4=C9=D4 =D7=D2=C5=CD=D1 =CE=C1 =D4=C1=CE=C3=D9 =D3 git, =D7=CD=C5=D3=D4=CF =D2=C1=C2=CF=D4=D9 =D3 =CB=CF= =C4=CF=CD. =DE=D4=CF =C9=CE=CF=C7=C4=C1 =D0=D2=CF=D7=CF=C3=C9=D2=D5=C5=D4 = =DC=CD=CF=C3=C9=CF=CE=C1=CC=D8=CE=D9=C5 =D7=D3=D0=CC=C5=D3=CB=C9 :) --=20 =F3 =D5=D7=C1=D6=C5=CE=C9=C5=CD =E1=C6=C1=CE=C1=D3=CF=D7 =E4=CD=C9=D4=D2=C9=CA --RnlQjJ0d97Da+TV1 Content-Type: application/pgp-signature; name="signature.asc" Content-Description: Digital signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.17 (GNU/Linux) iEYEARECAAYFAk1xWekACgkQ72GKvac0IyzghwCghnN8hpp+BYJNoX93Sm/QVnwy Lz8An0oMHMlewFngBYGOo/rS0eu/nd2I =TRLG -----END PGP SIGNATURE----- --RnlQjJ0d97Da+TV1--