From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Date: Sun, 26 Aug 2007 15:26:40 +0400 From: Alexey Tourbin To: devel@lists.altlinux.org Message-ID: <20070826112640.GH26788@solemn.turbinal> Mail-Followup-To: devel@lists.altlinux.org References: <200708252131.53435.artem.zolochevskiy@gmail.com> <200708252236.59153.artem.zolochevskiy@gmail.com> <20070825195442.GD26788@solemn.turbinal> <200708261354.08994.artem.zolochevskiy@gmail.com> Mime-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="uJWb33pM2TcUAXIl" Content-Disposition: inline In-Reply-To: <200708261354.08994.artem.zolochevskiy@gmail.com> Subject: Re: [devel] =?koi8-r?b?Z2l0L2dlYXIgySB1cHN0cmVhbQ==?= 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, 26 Aug 2007 11:26:54 -0000 Archived-At: List-Archive: List-Post: --uJWb33pM2TcUAXIl Content-Type: text/plain; charset=koi8-r Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Sun, Aug 26, 2007 at 01:54:08PM +0300, Artem Zolochevskiy wrote: > -->=D7=CF=D4 =D0=CF=CC=CF=D6=C9=CD =D7=D9=DB=CC=C1 =CE=CF=D7=C1=D1 =D7=C5= =D2=D3=C9=D1 <-- > (=CF=C2=CE=CF=D7=CC=D1=C5=CD =C9c=C8=CF=C4=CE=C9=CB=C9 =D7 =C2=D2=C1=CE= =DE=C5 upstream) > $ git branch upstream git-checkout upstream > $ gear-update ../archive/fdupes-1.12.tar.gz fdupes > $ git commit -m "fdupes-1.12.tar.gz" > $ git tag -a -m "fdupes 1.12" v1.12 > (=D0=C1=CB=D5=C5=CD) > $ git branch master =FA=C4=C5=D3=D8 =D4=CF=D6=C5 checkout > $ git merge v1.12 (=C4=CF=C2=C1=D7=CC=D1=C5=CD =CE=CF=D7=D9=C5 =C9=D3=C8= =CF=C4=CE=C9=CB=C9 =D7 master) =F1 =CF=C2=D9=DE=CE=CF =C4=C5=CC=C1=C0 =D4=C9=D0=C1 (=CB=C1=D6=C5=D4=D3=D1 = =DC=D4=CF =D7=D2=C5=C4=CE=C1=D1 =D0=D2=C9=D7=D9=DE=CB=C1) git-pull . upstream =C1 =C5=DD=A3 =CD=CF=D6=CE=CF =C4=C5=CC=C1=D4=D8 git-pull . tag vVER > $ vim fdupes.spec > $ git add fdupes.spec =F0=CF=D7=D4=CF=D2=CE=CF =C4=CF=C2=C1=D7=CC=D1=D4=D8 =CE=C5 =CE=C1=C4=CF, = =CD=CF=D6=CE=CF =D0=D2=CF=D3=D4=CF =C4=C5=CC=C1=D4=D8 gear-commit -a. =FE=D4=CF-=D4=CF =D1 =C4=CF =CB=CF=CE=C3=C1 =CE=C5 =D2=C1=DA=CF=C2=D2=C1=CC= =D3=D1 =CB=C1=CB =D4=C1=CD =DC=D4=CF=D4 =C9=CE=C4=C5=CB=D3 =CF=C2=CE=CF=D7= =CC=D1=C5=D4=D3=D1. > $ gear-commit > $ git tag -a -m "fdupes 1.12-alt1" 1.12-alt1 > --> =C7=CF=D4=CF=D7=CF, =D7=C5=D2=D3=C9=D1 1.12-alt1 <-- >=20 > =C9=D4=C4 =D0=CF =CB=D2=D5=C7=D5 =D0=CF =CD=C5=D2=C5 =D7=D9=C8=CF=C4=C1 = =CE=CF=D7=D9=C8 =D7=C5=D2=D3=C9=CA. =E4=C1, =D7 =C3=C5=CC=CF=CD =D7=D3=A3 =D4=C1=CB. > 2. =CE=C5 =C7=CF=D2=CF=C4=C9=CD upstream (=D4=D5=D4, =D7=C9=C4=C9=CD=CF, = =CB=C1=CB-=D4=CF =CE=C1=C4=CF =C8=C9=D4=D2=CF =CF=C2=CE=CF=D7=CC=D1=D4=D8 = =C9=D3=C8=CF=C4=CE=C9=CB=C9) >=20 > $ tar xf archive/fdupes-1.0.tar.gz > (=D4=D5=D4 =D5 =CD=C5=CE=D1 =CB=C1=D4=C1=CC=CF=C7 =D3 =D0=D2=C1=D7=C9=CC= =D8=CE=D9=CD =C9=CD=C5=CE=C5=CD =D0=CF=CC=D5=DE=C9=CC=D3=D1, =C1 =C5=D3=CC= =C9 =CE=C5=D4, =D4=CF =CE=C1=C4=CF =DE=D4=CF-=D4=CF=20 > =D7=D2=CF=C4=C5 - $ mv fdupes-version fdupes) > $ cd fdupes > $ ls > fdupes.c INSTALL Makefile README runtest testdir > $ git init > $ git add . > $ git commit -m "fdupes-1.0.tar.gz" > $ git tag -a -m "fdupes 1.0" v1.0 (=C4=C5=CC=C1=C5=CD tag =C4=CC=D1 =DC= =D4=CF=CA =D7=C5=D2=D3=C9=C9 =C9=D3=C8=CF=C4=CE=C9=CB=CF=D7) >=20 > --> =D7=CF=D4 =D4=D5=D4 =D7=CF=D0=D2=CF=D3: =CB=C1=CB =CF=C2=CE=CF=D7=C9= =D4=D8 =C9=D3=C8=CF=C4=CE=C9=CB=C9? <-- > gear-updates =D4=D5=D4 =D0=CF=CD=CF=D6=C5=D4? gear-update =DC=D4=CF =CB=C1=CB=C1=D1-=D4=CF =D3=D4=D2=C1=CE=CE=C1=D1 =DB= =D4=D5=CB=C1, =CB=CF=CD=CD=C9=D4=C1 =CF=CE=C1 =CE=C5 =C4=C5=CC=C1=D4, =DA=C1=DE=C5=CD =CE=D5=D6=CE=C1 =CE=C5 =D0=CF=CE=D1=CC. =E5=D3=CC=C9 =C2= =D9 =CF=CE=C1 =D0=CF=D3=CC=C5 =D2=C1=D3=D0=C1=CB=CF=D7=CB=C9 =C9=D3=CB=C1= =CC=C1 mtime =C9 =C4=C5=CC=C1=CC=C1 =CB=CF=CD=CD=C9=D4 =D3 =DC=D4=C9=CD mtime =DC=D4=CF = =C2=D9=CC=CF =C2=D9 =CB=D2=D5=DE=C5. > =D3=C1=CD=D5 =CC=CF=C7=C9=CB=D5 =C4=C1=CC=D8=CE=C5=CA=DB=C5=CA =D2=C1=C2= =CF=D4=D9 =D1 =D0=CF=CE=C9=CD=C1=C0 =D4=C1=CB-=D4=CF =D4=C1=CB: > $ git checkout -b temp v1.0 (=D7=D2=C5=CD=C5=CE=CE=D9=CA =C2=D2=C1=CE=DE = =C4=CC=D1 =C9=C8=CF=C4=CE=C9=CB=CF=D7) > $ =CB=C1=CB-=D4=CF =CF=C2=CE=CF=D7=CC=D1=C5=CD =C9=C8=CF=C4=CE=C9=CB=C9 = =C4=CF =CE=CF=D7=CF=CA =D7=C5=D2=D3=C9=C9 (v1.11) > $ git commit -m "fdupes-1.11.tar.gz" > $ git tag -a -m "fdupes 1.11" v1.11 (=C4=C5=CC=C1=C5=CD tag =C4=CC=D1 =DC= =D4=CF=CA =D7=C5=D2=D3=C9=C9 =C9=D3=C8=CF=C4=CE=C9=CB=CF=D7) > $ git branch -D temp > (=D1 =D7=C5=D2=CE=CF =D0=CF=CE=C9=CD=C1=C0 =DE=D4=CF =C2=D2=C1=CE=DE temp= =D4=D5=D4 =CD=CF=D6=CE=CF =D5=D6=C5 =D3=D4=C9=D2=C1=D4=D8?) =EE=D5=D6=CE=CF =C2=D5=C4=C5=D4 =D3=CE=C1=DE=C1=CC=C1 =D0=C5=D2=C5=CB=CC=C0= =DE=C9=D4=D8=D3=D1 =CE=C1 =C4=D2=D5=C7=CF=CA =C2=D2=C1=CE=DE. > (=D0=C1=CB=D5=C5=CD) > $ git checkout master > $ echo "tar: fdupes" > .gear-rules > $ vim fdupes.spec > $ git add .gear-rules fdupes.spec > $ gear-commit > $ git tag -a -m "fdupes 1.11-alt1" 1.11-alt1 > --> =C7=CF=D4=CF=D7=CF, =D7=C5=D2=D3=C9=D1 1.11-alt1 <-- >=20 > -->=D7=CF=D4 =D0=CF=CC=CF=D6=C9=CD =D7=D9=DB=CC=C1 =CE=CF=D7=C1=D1 =D7=C5= =D2=D3=C9=D1 <-- > (=CF=C2=CE=CF=D7=CC=D1=C5=CD =C9c=C8=CF=C4=CE=C9=CB=C9) > $ git checkout temp v1.11 > $ =CB=C1=CB-=D4=CF =CF=C2=CE=CF=D7=CC=D1=C5=CD =C9=C8=CF=C4=CE=C9=CB=C9 = =C4=CF =CE=CF=D7=CF=CA =D7=C5=D2=D3=C9=C9 (v1.12) > $ git commit -m "fdupes-1.11.tar.gz" > $ git tag -a -m "fdupes 1.11" v1.11 (=C4=C5=CC=C1=C5=CD tag =C4=CC=D1 =DC= =D4=CF=CA =D7=C5=D2=D3=C9=C9 =C9=D3=C8=CF=C4=CE=C9=CB=CF=D7) > $ git branch -D temp > (=D1 =D7=C5=D2=CE=CF =D0=CF=CE=C9=CD=C1=C0 =DE=D4=CF =C2=D2=C1=CE=DE temp= =D4=D5=D4 =CD=CF=D6=CE=CF =D5=D6=C5 =D3=D4=C9=D2=C1=D4=D8?) >=20 > (=D0=C1=CB=D5=C5=CD) > $ git branch master > $ git merge v1.12 (=C4=CF=C2=C1=D7=CC=D1=C5=CD =CE=CF=D7=D9=C5 =C9=D3=C8= =CF=C4=CE=C9=CB=C9 =D7 master) > $ vim fdupes.spec > $ git add fdupes.spec > $ gear-commit > $ git tag -a -m "fdupes 1.12-alt1" 1.12-alt1 > --> =C7=CF=D4=CF=D7=CF, =D7=C5=D2=D3=C9=D1 1.12-alt1 <-- >=20 > =C9=D4=C4 =D0=CF =CB=D2=D5=C7=D5 =D0=CF =CD=C5=D2=C5 =D7=D9=C8=CF=C4=C1 = =CE=CF=D7=D9=C8 =D7=C5=D2=D3=C9=CA. =EE=C1=D3=CB=CF=CC=D8=CB=CF =D1 =D0=CF=CE=C9=CD=C1=C0, =D7 =DC=D4=C9=C8 =C4= =D7=D5=C8 =D7=C1=D2=C9=C1=CE=D4=C1=C8 =D5 =F7=C1=D3 =D0=CF=CC=D5=DE=C9=D4= =D3=D1 =D0=CF=CC=CE=CF=D3=D4=D8=C0 =C1=CE=C1=CC=CF=C7=C9=DE=CE=C1=D1 =D3=D4=D2=D5=CB=D4=D5=D2=C1 =CB=CF=CD=CD= =C9=D4=CF=D7. * updated spec for tar2 /M merged tar2 * | tar2 | * updated spec for tar1 |/M merged tar1 * | tar1 | * added spec and .gear-rules 0/ tar0 =E2=D5=C4=C5=D4 =CC=C9 =CB=C1=CB=CF=CA-=D4=CF =C2=D2=C1=CE=DE =D3 =CF=D4=C4= =C5=CC=D8=CE=D9=CD =CE=C1=DA=D7=C1=CE=C9=C5=CD =D7 =D4=CF=DE=CB=C5 tar2, =CE=C5 =C9=CD=C5=C5=D4 =DA=CE=C1=DE=C5=CE=C9=D1. =F1 =C4=D5=CD=C1=CC =F7=D9 =C2=CF=CC=C5=C5 =D4=CF=CE=CB=C9=C5 =D7=CF=D0=D2= =CF=D3=D9 =D3=D0=D2=C1=DB=C9=D7=C1=C5=D4=C5, =CE=C1=D0=D2=C9=CD=C5=D2 =CB= =C1=CB =C2=D9=D4=D8 =D0=CFc=CC=C5 gear-srpmimport. --uJWb33pM2TcUAXIl Content-Type: application/pgp-signature Content-Disposition: inline -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.7 (GNU/Linux) iD8DBQFG0WNwfBKgtDjnu0YRAjrWAKDExZK+QmRdSQPm1hqNCT2n4H+9TQCfQ+IF Ftqof4aZiyUNoAQEHe6lyuo= =GOEQ -----END PGP SIGNATURE----- --uJWb33pM2TcUAXIl--