From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Date: Tue, 10 Apr 2007 00:37:55 +0400 From: Alexey Tourbin To: ALT Devel discussion list Message-ID: <20070409203755.GV9264@solemn.turbinal> Mail-Followup-To: ALT Devel discussion list References: <461A80BC.30606@stc.donpac.ru> <20070409195227.GT9264@solemn.turbinal> <20070409200151.GB23196@basalt.office.altlinux.org> Mime-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="gPQW1Pk7T/0rhUBV" Content-Disposition: inline In-Reply-To: <20070409200151.GB23196@basalt.office.altlinux.org> Subject: Re: [devel] =?koi8-r?b?5d3FIM/Ezs8gSE9XVE8g0NLPINPCz9LL1SDQwcvF1MEg?= =?koi8-r?b?1yBnaXQuYWx0IMkgyc7UxcfSwcPJwCDTIHVwc3RyZWFtIHNjbQ==?= 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: Mon, 09 Apr 2007 20:37:47 -0000 Archived-At: List-Archive: List-Post: --gPQW1Pk7T/0rhUBV Content-Type: text/plain; charset=koi8-r Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Tue, Apr 10, 2007 at 12:01:51AM +0400, Dmitry V. Levin wrote: > On Mon, Apr 09, 2007 at 11:52:27PM +0400, Alexey Tourbin wrote: > > On Mon, Apr 09, 2007 at 10:06:52PM +0400, Eugene Prokopiev wrote: > > > http://wiki.sisyphus.ru/devel/gear/ImportUpstreamVBranch > > > http://wiki.sisyphus.ru/devel/gear/ImportSeparateUpstream > >=20 > > =F7 =CF=C2=DD=C5=CD, =D1 =C2=D9 =CE=C5 =D3=D4=C1=CC =C4=C5=CC=C1=D4=D8,= =CB=C1=CB =D4=C1=CD =CE=C1=D0=C9=D3=C1=CE=CF. >=20 > =F4=D9 =C9=CD=C5=C5=DB=D8 =D7 =D7=C9=C4=D5 =D0=C5=D2=D7=D9=CA =D2=C5=C3= =C5=D0=D4 (=CB=CF=C7=C4=C1 =C5=D3=D4=D8 upstream scm) =C9=CC=C9 =D7=D4=CF= =D2=CF=CA =D2=C5=C3=C5=D0=D4 > (=CB=CF=C7=C4=C1 =C5=D3=D4=D8 =D4=CF=CC=D8=CB=CF upstream tarball)? =F5 =CD=D5=D4=D4=C1 1.5 =D7=D2=CF=C4=C5 =D4=CF=D6=C5 =C5=D3=D4=D8 git. =F7 =D3=CC=D5=DE=C1=C5 =D3 =D4=C1=D2=C2=CF=CC=CC=C1=CD=C9 =C9=CE=CF=C7=C4= =C1 =D5=C4=CF=C2=CE=C5=C5 =C4=C5=D2=C1=D6=D4=D8 =D3=CF=C4=C5=D2=D6=C9=CD=CF= =C5 =D4=C1=D2=C2=CF=CC=CC=C1 =D7 =D0=CF=C4=CB=C1=D4=C1=CC=CF=C7=C5, =C1 =D0=C1=D4=DE=C9 =C4=C5=D2=D6=C1=D4= =D8 =CF=D4=C4=C5=CC=D8=CE=CF; =C1 =C9=CE=CF=C7=C4=C1 =D5=C4=CF=C2=CE=C5=C5 = =D0=D2=C9=CB=CC=C1=C4=D9=D7=C1=D4=D8 =D0=C1=D4=DE=C9 =CB =D4=C1=D2=C2=CF=CC=CC=D5, =D4=CF=C7=C4=C1 =D0=CF=C4=CB= =C1=D4=C1=CC=CF=C7 =CE=C5 =CE=D5=D6=C5=CE (=C1 spec =D0=CF=CC=CF=D6=C9=D4= =D8 =D0=D2=D1=CD=CF =D7 =CB=C1=D4=C1=CC=CF=C7, =DC=D4=CF =CE=C5 =CB=D2=C9=CD=C9=CE=C1=CC=D8=CE=CF). =EE=D5, =C5=D3=CC=C9 =D4=C1=D2=C2=CF=CC=CC=D9 =D7=D9=C8=CF=C4=D1=D4 =C4=CF= =D3=D4=C1=D4=CF=DE=CE=CF =DE=C1=D3=D4=CF, =C9 =C5=D3=CC=C9 =C9=DA=CD=C5=CE= =C5=CE=C9=D1 =D7 =CE=C9=C8 =CE=C5 =CF=DE=C5=CE=D8 =C2=CF=CC=D8=DB=C9=C5, =D4=CF=C7=C4=C1 =C5=D3=D4=D8 = =CE=C1=C4=C5=D6=C4=C1 =CE=C1 =C4=CF=D3=D4=C1=D4=CF=DE=CE=CF =D0=D2=CF=D3=D4= =CF=CA merge =D3 =CE=CF=D7=D9=CD =D4=C1=D2=C2=CF=CC=CC=CF=CD, =C9 =CD=CF=D6=CE=CF =D0=C1=D4= =DE=C9 =D0=D2=C9=CB=CC=C1=C4=D9=D7=C1=D4=D8. =E5=D3=CC=C9 =D6=C5 =D7 =D7 = =CB=C1=D6=C4=CF=CD =CF=DE=C5=D2=C5=C4=CE=CF=CD =D4=C1=D2=C2=CF=CC=CC=C5 =D7=D3=A3 =D0=C5=D2=C5= =C4=C5=CC=D9=D7=C1=C0=D4, =C9 =D7 =D2=C5=DA=D5=CC=D8=D4=C1=D4=C5 =CD=C5=D2= =D6=C1 =D0=CF=CC=D5=DE=C1=C5=D4=D3=D1 =CD=CE=CF=C7=CF =CB=CF=CE=C6=C9=CC=CB=D4=CF=D7, =D4=CF=C7=C4=C1 =D0=D2=CF= =DD=C5 =C4=C5=D2=D6=C1=D4=D8 =D0=C1=D4=DE=C9 =CF=D4=C4=C5=CC=D8=CE=CF. =F4= =C1=CB=D6=C5 =DC=D4=CF =CB=C1=D3=C1=C5=D4=D3=D1 =CE=C5=CB=CF=D4=CF=D2=D9=C8 =D3=CC=D5=DE=C1=C5=D7,= =CB=CF=C7=C4=C1 =C2=CF=CC=D8=DB=C9=CE=D3=D4=D7=CF =D0=C1=D4=DE=C5=CA =C9= =CD=CF=D2=D4=C9=D2=D5=C5=D4=D3=D1 =CF=D4=CB=D5=C4=C1-=D4=CF =C5=DD=A3, =CE=C1=D0=D2=C9=CD=C5=D2 =C9=DA =C6=C5= =C4=CF=D2=D9. =F1 =CE=C1=D0=D2=C9=CD=C5=D2 =CE=C5 =DA=CE=C1=C0, =CB=C1=CB =CD=CE=C5 =D3= =C5=CA=DE=C1=D3 =D3 netpbm =D7 =DC=D4=CF=CD =CF=D4=CE=CF=DB=C5=CE=C9=C9 =C2= =D9=D4=D8. =F7=D3=A3 =D7=D2=C5=CD=D1 =CF=D4=CB=CC=C1=C4=D9=D7=C1=C0 =C5=C7=CF =D7 =C4= =CF=CC=C7=C9=CA =D1=DD=C9=CB. :( > > =ED=CF=C7=D5 =D0=CF=C4=D2=CF=C2=CE=C5=C5 =CF=C2=DF=D1=D3=CE=D4=D8, =CB= =C1=CB =D1 =C2=D9 =D3=C4=C5=CC=C1=CC, =C5=D3=CC=C9 =CE=C5 =D0=CF=CE=D1=D4= =CE=CF. > =F0=CF=CB=C1 =CE=C5 =D0=CF=CE=D1=D4=CE=CF. ;) =E4=CF=D0=D5=D3=D4=C9=CD =DE=D4=CF =C5=D3=D4=D8 =C1=D0=D3=D4=D2=C9=CD=CE=D9= =CA project.git, =D7 =CB=CF=D4=CF=D2=CF=CD =C5=D3=D4=D8 =D4=C1=C7=C9 1.1, 1= .2, 1.3 =C9 =CF=D3=CE=CF=D7=CE=CF=CA =C2=D2=C1=CE=DE master, =CB=CF=D4=CF=D2=D9= =CA =D3=CF=C4=C5=D2=D6=C9=D4 =DC=D4=C9 =D4=C1=C7=C9. (=EE=C1 =D3=C1=CD=CF= =CD =C4=C5=CC=C5 =CE=C5 =D7=C1=D6=CE=CF, git =DC=D4=CF =C9=CC=C9 git-svnimport =C9=CC=C9 git-cvsimp= ort.) =E4=CF=D0=D5=D3=D4=C9=CD, =DE=D4=CF =D5 =CE=C1=D3 =C5=D3=D4=D8 project-1.1.= src.rpm =C9 project-1.2.src.rpm. =ED=D9 =C8=CF=D4=C9=CD =C9=CD=D0=CF=D2=D4=C9=D2=CF=D7=C1=D4=D8 =DC=D4=C9 sr= c.rpm'=D9 =C9 =D3=CF=C2=D2=C1=D4=D8 =CE=CF=D7=D9=CA =D2=C5=CC=C9=DA 1.3 (= =C9=CC=C9 =D0=D2=D1=CD=CF origin). =F1 =C2=D9 =C9=CD=CF=D2=D4=C9=D2=CF=D7=C1=CC =D7=CF=D4 =CB=C1=CB. =F3=CE= =C1=DE=C1=CC=C1 =CB=CC=CF=CE=C9=D2=D5=C5=CD =C1=D0=D3=D4=D2=C9=CD, =C9=CD= =C5=C5=CD =C2=D2=C1=CE=DE origin. =F0=D2=C5=D0=CF=C4=CF=CC=D6=C9=CD, =DE=D4=CF =D7 src.rpm'=C1=C8 =C5=D3=D4= =D8 =D7=D3=C5=C7=CF =CF=C4=C9=CE "=C2=CF=CC=D8=DB=CF=CA" =D4=C1=D2=C2=CF=CC= =CC =D3 =D0=CF=C4=CB=C1=D4=C1=CC=CF=C7=CF=CD, =C1 =C4=D2=D5=C7=C9=C8 =D4=C1=D2=C2= =CF=CC=CC=CF=D7 =CE=C5=D4 (=CE=CF, =D7=CF=DA=CD=CF=D6=CE=CF =C5=D3=D4=D8 = =D0=C1=D4=DE=C9). =F4=CF=C7=C4=C1 =CD=CF=D6=CE=CF =D0=D2=C9=CD=C5=CE=C9=D4=D8 =CD=CF=C4=C9=C6= =C9=C3=C9=D2=CF=D7=C1=CE=CE=D9=CA gear-srpmimport, =CB=CF=D4=CF=D2=D9=CA =CE=C5 =D3=CF=DA=C4=C1=C5=D4 =D0=CF=C4=CB=C1=D4=C1=CC=CF=C7=C1, =DE=D4=CF= =C2=D9 =C9=DA=C2=C5=D6=C1=D4=D8 =D0=C5=D2=C5=CD=C5=DD=C5=CE=C9=D1 =C6=C1=CA= =CC=CF=D7. =E9=CD=D0=CF=D2=D4=C9=D2=D5=C5=CD src.rpm'=D9, =D0=D2=C9=D7=D1=DA=D9=D7=C1= =D1 =C9=C8 =CB =C1=D0=D3=D4=D2=C9=CD=CE=D9=CD =D4=C1=C7=C1=CD. $ git-checkout -b srpms 1.1 $ gear-srpmimport project-1.1.src.rpm $ git-branch foo 1.2 $ git-pull --no-commit -s ours . foo && git-branch -D foo $ gear-srpmimport project-1.2.src.rpm =FA=C4=C5=D3=D8 =D0=D2=CF=C9=D3=C8=CF=C4=C9=D4 merge =C1=D0=D3=D4=D2=C9=CD= =CE=CF=C7=CF =D4=C1=C7=C1 1.2 =C9 =CE=C1=DB=C5=CA =D0=D2=C5=C4=D9=C4=D5=DD= =C5=CA =D3=C2=CF=D2=CB=C9 1.1-alt1. =F3 =D0=C5=D2=D7=CF=C7=CF =D2=C1=DA=C1 =DC=D4=CF=D4 =D4=D2=C0=CB= , =CE=C1=D7=C5=D2=CE=CF=C5, =D3=CC=CF=D6=CE=CF =D0=CF=CE=D1=D4=D8. =EB =D3=CF=D6=C1=CC=C5=CE=C9=C0, =D1 =CE=C5 =DA=CE=C1=C0, =CB=C1=CB =DC=D4=CF = =CD=CF=D6=CE=CF =D0=D2=C5=C4=C5=CC=D8=CE=CF =D0=CF=CE=D1=D4=CE=CF =CF=C2=DF= =D1=D3=CE=C9=D4=D8. =F4=C5=D0=C5=D2=D8 =CD=D9 =D3=D4=CF=C9=CD =CE=C1 =C2=D2=C1=CE=DE=C5 srpms, = =C9 =CE=C1 =CE=C5=C7=CF =D0=CF=CB=C1=DA=D9=D7=C1=C5=D4 =D4=C1=C7 1.2-alt1. =F0=C5=D2=C9=CD=C5=CE=CF=D7=D9=D7=C1=C5=CD =C2=D2=C1=CE=DE srpms =D7 =C2=D2= =C1=CE=DE master =C9 =D0=D2=CF=C4=CF=CC=D6=C1=C5=CD =D3 =CE=C9=CD =D2=C1=C2= =CF=D4=C1=D4=D8 =CB=C1=CB =D3 =CF=D3=CE=CF=D7=CE=D9=CD =C2=D2=C1=CE=DE=C5=CD =C4=CC=D1 =D0= =CF=C4=C7=CF=D4=CF=D7=CB=C9 =D0=C1=CB=C5=D4=CF=D7. $ git-branch -D master $ git-checkout -b master srpms $ git-branch -D srpms =EE=D5=D6=CE=CF =D0=D2=CF=D7=C5=D2=C9=D4=D8, =DE=D4=CF git-diff 1.2..1.2-al= t1 =D0=CF=CB=C1=DA=D9=D7=C1=C5=D4 =D4=CF=CC=D8=CB=CF *.spec =C9 =2Egear-rules (=CB=D2=CF=CD=C5, =C2=D9=D4=D8 =CD=CF=D6=C5=D4, $Id$ =C9 =D0= =D2=CF=DE=C5=CA =CD=C9=DB=D5=D2=D9). =F4=C5=D0=C5=D2=D8 =CD=CF=D6=CE=CF =D0=D2=C9=CC=CF=D6=C9=D4=D8 =D0=C1=D4=DE= =C9, =C5=D3=CC=C9 =CF=CE=C9 =C5=D3=D4=D8, =D0=D2=D1=CD=CF =CB =C4=C5=D2=C5= =D7=D5 =C9=D3=C8=CF=C4=CE=C9=CB=CF=D7. =E5=D3=CC=C9 =D0=D2=C9=CC=CF=D6=C9=CC=C9 =D0=C1=D4=DE=C9, =D6=C5=CC=C1=D4= =C5=CC=D8=CE=CF =C4=CF=C2=C1=D7=C9=D4=D8 %release =D7 =CE=C1=DA=D7=C1=CE=C9= =C5 =D4=C1=D2=C2=CF=CC=CC=C1 =C9 =D7 .gear-rules. =F4=C1=CB=D6=C5 =D6=C5=CC=C1=D4=C5=CC=D8=CE=CF =D2=C1=DA= =D6=C1=D4=D8 =D4=C1=D2=C2=CF=CC=CC, =DE=D4=CF=C2=D9 =C2=D9=CC =D0=D2=CF=D3= =D4=CF *.tar. =E4=C1=CC=D8=DB=C5 =C4=C5=CC=C1=C5=CD $ git-pull . origin =EE=C1=DB=C1 =D3=C2=CF=D2=CB=C1 =D0=C5=D2=C5=CD=C5=D3=D4=C9=CC=C1=D3=D8 =CE= =C1 origin. =F4=C5=D0=C5=D2=D8 =CD=CF=D6=CE=CF =D3=C4=C5=CC=C1=D4=D8 $ gear --rpm -- rpm -bc =E5=D3=CC=C9 =D7=D3=A3 =D2=C1=C2=CF=D4=C1=C5=D4, =D4=CF =CF=D3=D4=C1=C5=D4= =D3=D1 =C9=D3=D0=D2=C1=D7=C9=D4=D8 version =C9 release =D7 =D3=D0=C5=CB=C5 = =CE=C1 1.3-alt1 (=C9=CC=C9 1.4-alt0.1) =C9 =D3=C4=C5=CC=C1=D4=D8 gear-commit -a. --gPQW1Pk7T/0rhUBV Content-Type: application/pgp-signature Content-Disposition: inline -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.7 (GNU/Linux) iD8DBQFGGqQjfBKgtDjnu0YRAhrOAKC45FF9cqJgdgWyLVB0A0Rp0yElPACcCCUY 0xgL5kgMbV1zvguRsWLInjI= =wbTg -----END PGP SIGNATURE----- --gPQW1Pk7T/0rhUBV--