From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Message-ID: <47378E61.9040909@altlinux.ru> Date: Mon, 12 Nov 2007 02:21:05 +0300 From: Alexey Gladkov Organization: ALT Linux User-Agent: Mozilla/5.0 (X11; U; Linux i686; ru; rv:1.8.1.6) Gecko/20070803 Thunderbird/2.0.0.6 Mnenhy/0.7.5.0 MIME-Version: 1.0 To: ALT Linux Team development discussions 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> <20071106201707.GA11864@hell.fortress> In-Reply-To: <20071106201707.GA11864@hell.fortress> X-Enigmail-Version: 0.95.2 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable 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: Sun, 11 Nov 2007 22:21:55 -0000 Archived-At: List-Archive: List-Post: Alexey I. Froloff wrote: > =D0=A3 =D0=BD=D0=B0=D1=81 =D0=B5=D1=81=D1=82=D1=8C =D0=B2=D0=B5=D1=82=D0= =BA=D0=B0 upstream, =D0=B2=D0=B5=D1=82=D0=BA=D0=B8 =D1=81 =D0=BF=D0=B0=D1= =82=D1=87=D0=B0=D0=BC=D0=B8 patch-A, patch-B, > patch-C, patch-D =D0=B8 master, =D0=B8=D0=B7 =D0=BA=D0=BE=D1=82=D0=BE=D1= =80=D0=BE=D0=B3=D0=BE =D0=B8=D0=B4=D1=91=D1=82 =D1=81=D0=B1=D0=BE=D1=80=D0= =BA=D0=B0. =D0=A1=D0=B0=D0=BC=D1=8B=D0=B9 > =D0=BF=D1=80=D0=BE=D1=81=D1=82=D0=BE=D0=B9 =D1=81=D0=BB=D1=83=D1=87=D0=B0= =D0=B9, =D0=B2=D1=8B=D1=85=D0=BE=D0=B4 =D0=BD=D0=BE=D0=B2=D0=BE=D0=B3=D0=BE= upstream: >=20 > $ 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) =D0=AF =D0=B8=D0=B7=D0=BC=D0=B5=D0=BD=D0=B8=D0=BB =D1=81=D0=B8=D0=BD=D1=82= =D0=B0=D0=BA=D1=81=D0=B8=D1=81 =D1=83 =D0=BF=D1=80=D0=B0=D0=B2=D0=B8=D0=BB= =D1=87=D1=82=D0=BE=D0=B1=D1=8B =D0=BC=D0=BE=D0=B6=D0=BD=D0=BE =D0=B1=D1=8B= =D0=BB=D0=BE =D1=80=D0=B5=D0=B0=D0=BB=D0=B8=D0=B7=D0=BE=D0=B2=D0=B0=D1=82= =D1=8C =D1=82=D0=B0=D0=BA=D0=BE=D0=B9 =D0=BF=D0=BE=D0=B4=D1=85=D0=BE=D0=B4. =D0=A2=D0=B5=D0=BF=D0=B5=D1=80=D1=8C= =D0=BF=D1=80=D0=B8 =D1=83=D0=BA=D0=B0=D0=B7=D0=B0=D0=BD=D0=B8=D0=B8 =D0=BF= =D1=80=D0=B0=D0=B2=D0=B8=D0=BB=D0=B0 merge =D0=BD=D1=83=D0=B6=D0=BD=D0=BE= =D1=83=D0=BA=D0=B0=D0=B7=D1=8B=D0=B2=D0=B0=D1=82=D1=8C =D0=BA=D0=BE=D0=B3= =D0=BE =D1=81 =D0=BA=D0=B5=D0=BC =D0=BD=D1=83=D0=B6=D0=BD=D0=BE merge'=D0=B8=D1=82=D1=8C. =D0=A2=D0=B0=D0=BA=D0=B6=D0=B5 =D1=8F =D1=81=D0=B4=D0=B5=D0=BB=D0=B0=D0=BB= , =D0=BA=D0=B0=D0=BA =D1=82=D1=8B =D0=B8 =D0=BF=D1=80=D0=BE=D1=81=D0=B8=D0= =BB, =D0=B8=D0=BD=D1=82=D0=B5=D1=80=D0=B0=D0=BA=D1=82=D0=B8=D0=B2=D0=BD=D1= =8B=D0=B9 =D1=80=D0=B5=D0=B6=D0=B8=D0=BC =D1=80=D0=B0=D0=B1=D0=BE=D1=82=D1= =8B =D1=8D=D1=82=D0=BE=D0=B9 =D1=83=D1=82=D0=B8=D0=BB=D0=B8=D1=82=D1=8B. =D0=A2=D0=B5=D0=BF=D0=B5=D1=80= =D1=8C =D0=BE=D0=BD=D0=B0 =D1=81=D0=BF=D1=80=D0=B0=D1=88=D0=B8=D0=B2=D0=B0= =D0=B5=D1=82, =D0=BF=D1=80=D0=B8=D0=BC=D0=B5=D0=BD=D1=8F=D1=82=D1=8C =D0=BF= =D1=80=D0=B0=D0=B2=D0=B8=D0=BB=D0=BE =D0=B8=D0=BB=D0=B8 =D0=BD=D0=B5=D1=82= =2E gear-merge =D1=83=D0=B6=D0=B5 =D0=B4=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB=D0=B5=D0= =BD =D0=B2 =D0=BE=D1=81=D0=BD=D0=BE=D0=B2=D0=BD=D1=83=D1=8E =D0=B2=D0=B5=D1= =82=D0=BA=D1=83. > =D0=9E=D1=82 =D1=83=D1=82=D0=B8=D0=BB=D0=B8=D1=82=D1=8B =D1=85=D0=BE=D1= =87=D0=B5=D1=82=D1=81=D1=8F =D1=81=D0=BA=D0=B0=D0=B7=D0=B0=D1=82=D1=8C "=D1= =81=D0=BC=D0=B5=D1=80=D0=B6=D0=B8 =D0=BC=D0=BD=D0=B5 =D0=BE=D1=82=D1=81=D1= =8E=D0=B4=D0=B0 (1) =D0=B8 =D0=B4=D0=BE =D0=BE=D0=B1=D0=B5=D0=B4=D0=B0 > (2)", =D0=BF=D0=BE=D1=82=D0=BE=D0=BC "=D0=B2=D0=BE=D1=82 =D0=BE=D1=82=D1= =81=D1=8E=D0=B4=D0=B0 (3) =D0=B8 =D0=B4=D0=BE master (4)". =D0=9C=D0=BE=D0= =B6=D0=B5=D1=82 =D0=B1=D1=8B=D1=82=D1=8C =D0=B4=D0=B0=D0=B6=D0=B5 =D1=81 > =D1=82=D0=B0=D0=BA=D0=B8=D0=BC =D0=B8=D0=BD=D1=82=D0=B5=D1=80=D1=84=D0=B5= =D0=B9=D1=81=D0=BE=D0=BC, =D0=BA=D0=B0=D0=BA =D1=8D=D1=82=D0=BE =D0=B4=D0= =B5=D0=BB=D0=B0=D0=B5=D1=82 git-rebase, =D1=87=D1=82=D0=BE=D0=B1=D1=8B =D0= =BC=D0=BE=D0=B6=D0=BD=D0=BE =D0=B1=D1=8B=D0=BB=D0=BE > =D1=80=D0=B0=D0=B7=D1=80=D0=B5=D1=88=D0=B8=D1=82=D1=8C =D0=BA=D0=BE=D0=BD= =D1=84=D0=BB=D0=B8=D0=BA=D1=82 =D0=B8 =D0=BF=D1=80=D0=BE=D0=B4=D0=BE=D0=BB= =D0=B6=D0=B8=D1=82=D1=8C =D0=BC=D0=B5=D1=80=D0=B6. "=D0=9E=D1=82=D1=81=D1=8E=D0=B4=D0=B0 =D0=B8 =D0=B4=D0=BE =D0=BE=D0=B1=D0= =B5=D0=B4=D0=B0" =D0=BF=D0=BE=D0=BA=D0=B0 =D0=BD=D0=B5 =D1=80=D0=B5=D0=B0= =D0=BB=D0=B8=D0=B7=D0=BE=D0=B2=D0=B0=D0=BD=D0=BE, =D0=BD=D0=BE =D1=81 =D1= =83=D1=87=D1=91=D1=82=D0=BE=D0=BC =D0=B8=D0=BD=D1=82=D0=B5=D1=80=D0=B0=D0= =BA=D1=82=D0=B8=D0=B2=D0=BD=D0=BE=D0=B3=D0=BE =D1=80=D0=B5=D0=B6=D0=B8=D0=BC=D0=B0 =D0=BD=D0=B5 =D0=BF=D1=80=D0=B8=D0=BC= =D0=B5=D0=BD=D1=8F=D1=82=D1=8C =D0=BD=D0=B5=D0=BA=D0=BE=D1=82=D0=BE=D1=80= =D1=8B=D0=B5 =D0=BF=D1=80=D0=B0=D0=B2=D0=B8=D0=BB=D0=B0 =D0=BC=D0=BE=D0=B6= =D0=BD=D0=BE. --=20 Rgrds, legion