From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Date: Tue, 6 Nov 2007 23:17:08 +0300 From: "Alexey I. Froloff" To: ALT Devel discussion list Message-ID: <20071106201707.GA11864@hell.fortress> References: <47305E5A.1040209@altlinux.ru> <20071106132909.GL26960@immo.ru> <47307008.2030002@altlinux.ru> <20071106140812.GM26960@immo.ru> <473076E4.2010705@altlinux.ru> <20071106144045.GN26960@immo.ru> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="LZvS9be/3tNcYl/X" Content-Disposition: inline In-Reply-To: <20071106144045.GN26960@immo.ru> User-Agent: Mutt/1.5.16 (2007-06-09) Subject: Re: [devel] I: gear new utility X-BeenThere: devel@lists.altlinux.org X-Mailman-Version: 2.1.9 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: Tue, 06 Nov 2007 20:17:09 -0000 Archived-At: List-Archive: List-Post: --LZvS9be/3tNcYl/X Content-Type: text/plain; charset=koi8-r Content-Disposition: inline Content-Transfer-Encoding: quoted-printable * Alexey I. Froloff [071106 17:47]: > > =E5=D3=CC=C9 =C4=C1, =D4=CF =CF=D0=C9=DB=C9 =D0=CF=C4=D2=CF=C2=CE=C5=C5= =D0=CF=D6=C1=CC=D5=CA=D3=D4=C1. =F1 =CE=C1 =DC=D4=D5 =D4=C5=CD=D5 =D4=CF= =D6=C5 > > =C4=D5=CD=C1=CC, =CE=CF =DA=C1=C4=C1=DE =D4=C1=CB=C9=C8 =D5 =CD=C5=CE= =D1 =CE=C5=D4, =D0=CF=DC=D4=CF=CD=D5 =CE=C5 =D2=C5=C1=CC=C9=DA=CF=D7=C1=CC. > http://lists.altlinux.ru/pipermail/sisyphus/2007-September/207264.html > =EE=D5 =C9 =D0=CC=C0=D3 =E4=C1=CD=C9=D2 =D3=D7=CF=CA =D3=CB=D2=C9=D0=D4 = =CB=C9=C4=C1=CC. =F5 =CE=C1=D3 =C5=D3=D4=D8 =D7=C5=D4=CB=C1 upstream, =D7=C5=D4=CB=C9 =D3 = =D0=C1=D4=DE=C1=CD=C9 patch-A, patch-B, patch-C, patch-D =C9 master, =C9=DA =CB=CF=D4=CF=D2=CF=C7=CF =C9=C4=A3=D4 = =D3=C2=CF=D2=CB=C1. =F3=C1=CD=D9=CA =D0=D2=CF=D3=D4=CF=CA =D3=CC=D5=DE=C1=CA, =D7=D9=C8=CF=C4 =CE=CF=D7=CF=C7= =CF upstream: $ git checkout upstream $ gear-update ... $ git commit // (1) $ git checkout patch-A $ git pull . upstream $ git checkout patch-B $ git pull . patch-A $ git checkout patch-C $ git pull . patch-B // (2) [vim commit vim commit] // (3) $ git checkout patch-D $ git pull . patch-C $ git checkout master $ git pull . patch-D // (4) =F3=CF=C2=D3=CE=CF, =C9=CD=C5=C5=D4 =DA=CE=C1=DE=C5=CE=C9=C5 =D0=CF=D2=D1= =C4=CF=CB =D7=C5=D4=CF=CB, =CF=CE =CE=C5 =CD=C5=CE=D1=C5=D4=D3=D1, =D7=CF= =DA=CD=CF=D6=CE=CF =CE=C5=CB=CF=D4=CF=D2=D9=C5 =D7=C5=D4=CB=C9 =C2=D5=C4=D5=D4 =D5=C4=C1=CC=D1= =D4=D8=D3=D1 =C9=CC=C9 =C4=CF=C2=C1=D7=CC=D1=D4=D8=D3=D1 =D7 =D0=D2=CF=C3= =C5=D3=D3=C5 =D2=C1=C2=CF=D4=D9. =E5=D3=CC=C9 =C8=CF=DE=C5=D4=D3=D1 =C7=C5=CE=C5=D2=C9= =D4=D8 =C4=C9=C6=C6=D9, =C4=C5=CC=C1=D4=D8 =DC=D4=CF =CE=C1=C4=CF =CD=C5=D6= =C4=D5 upstream =C9 patch-A, patch-A =C9 patch-B =C9 =D4.=C4. =EF=D4 =D5=D4=C9=CC=C9=D4=D9 =C8=CF=DE=C5=D4=D3=D1 =D3=CB=C1=DA=C1=D4=D8 "= =D3=CD=C5=D2=D6=C9 =CD=CE=C5 =CF=D4=D3=C0=C4=C1 (1) =C9 =C4=CF =CF=C2=C5=C4= =C1 (2)", =D0=CF=D4=CF=CD "=D7=CF=D4 =CF=D4=D3=C0=C4=C1 (3) =C9 =C4=CF master (= 4)". =ED=CF=D6=C5=D4 =C2=D9=D4=D8 =C4=C1=D6=C5 =D3 =D4=C1=CB=C9=CD =C9=CE=D4=C5=D2=C6=C5=CA=D3=CF=CD, =CB=C1=CB =DC=D4=CF =C4= =C5=CC=C1=C5=D4 git-rebase, =DE=D4=CF=C2=D9 =CD=CF=D6=CE=CF =C2=D9=CC=CF =D2=C1=DA=D2=C5=DB=C9=D4=D8 =CB=CF=CE=C6=CC=C9=CB=D4 =C9 =D0=D2=CF=C4=CF=CC= =D6=C9=D4=D8 =CD=C5=D2=D6. --=20 Regards, Sir Raorn. --LZvS9be/3tNcYl/X Content-Type: application/pgp-signature; name="signature.asc" Content-Description: Digital signature Content-Disposition: inline -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.7 (GNU/Linux) iD8DBQFHMMu9VqT7+fkT8woRArXOAJwONljiPGytgu4KzgYynYLheTpAVgCfbIdy woqdN4s5ca4gdOHM1oLKCYk= =ct9S -----END PGP SIGNATURE----- --LZvS9be/3tNcYl/X--