From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Date: Mon, 18 Sep 2006 02:01:36 +0400 From: "Dmitry V. Levin" To: ALT Devel discussion list Message-ID: <20060917220136.GB16391@basalt.office.altlinux.org> Mail-Followup-To: ALT Devel discussion list References: <20060917060119.GA2302@localhost.localdomain> <20060917133248.GA4942@basalt.office.altlinux.org> <20060917164353.GA17697@localhost.localdomain> Mime-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="LpQ9ahxlCli8rRTG" Content-Disposition: inline In-Reply-To: <20060917164353.GA17697@localhost.localdomain> X-fingerprint: FE4C 93AB E19A 2E4C CB5D 3E4E 7CAB E6AC 9E35 361E Subject: Re: [devel] =?koi8-r?b?Z2l0IMkgwdfUz9DPzc/d2CDXINPP2sTBzsnJIGNoYW5n?= =?koi8-r?b?ZWxvZw==?= 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, 17 Sep 2006 22:01:36 -0000 Archived-At: List-Archive: List-Post: --LpQ9ahxlCli8rRTG Content-Type: text/plain; charset=koi8-r Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Sun, Sep 17, 2006 at 08:43:53PM +0400, =E4=C5=CE=C9=D3 =F3=CD=C9=D2=CE= =CF=D7 wrote: > On Sun, Sep 17, 2006 at 05:32:48PM +0400, Dmitry V. Levin wrote: >=20 > >> =E1 =CD=CF=D6=CE=CF =D0=C5=D2=C5=C4 merge =D0=CF=CC=D5=DE=C9=D4=D8 =D0= =D2=CF=D3=D4=CF changelog =D7=CC=C9=D7=C1=C5=CD=CF=CA =D7=C5=D4=CB=C9 =D3 = =CD=CF=CD=C5=CE=D4=C1 > >> common ancestor? > DVL> =E1 =DA=C1=DE=C5=CD? >=20 > =F5 =CD=C5=CE=D1 =D0=D2=CF=C3=C5=D3=D3 =D7=D9=C7=CC=D1=C4=C9=D4 =D4=C1=CB: > git-svn fetch > git pull . refs/remotes/git-svn > - =C9=DA=CD=C5=CE=C9=D4=D8 =D7=C5=D2=D3=C9=C0 =D7 spec > - =CE=C1=D0=C9=D3=C1=D4=D8 changelog (=CB=CF=D4=CF=D2=D9=CA =CF=D3=CE=CF= =D7=C1=CE =CE=C1 =D3=CF=C4=C5=D2=D6=C9=CD=CF=CD changelog =CD=C5=D6=C4=D5 > commaon ancestor =C9 git-svn) > - commit > - gear >=20 > =F3=C5=CA=DE=C1=D3, =CB=CF=C7=C4=C1 =CD=CE=C5 =D0=D2=C9=C8=CF=C4=C9=D4=D3= =D1 =D3=CF=C2=C9=D2=C1=D4=D8 =DE=D5=D4=D8 =CC=C9 =CE=C5 =CB=C1=D6=C4=D9=CA = =C4=C5=CE=D8, =C4=CC=D1 =DC=D4=CF=C7=CF > =D3=D7=CF=CA =D3=CB=D2=C9=D0=D4 (=D3=CD svn-update =D5 =CD=C5=CE=D1 =D7 a= sterisk-trunk-sources.git) >=20 > >> =F5=C4=CF=C2=CE=CF =DE=D4=CF=C2=D9 =CE=C1 =C2=C1=DA=C5 svn log =CD=CF= =D6=CE=CF =C2=D9=CC=CF =C2=CF=CC=C5=C5 =D5=C4=CF=C2=CE=CF =C4=C5=CC=C1=D4= =D8 changelog. > DVL> changelog =CD=CF=D6=CE=CF =D0=CF=D4=CF=CD =CF=D4=D2=C5=C4=C1=CB=D4= =C9=D2=CF=D7=C1=D4=D8, =D3=CD. git-commit --amend. >=20 > =F1 =C9=CD=C5=CC =D7 =D7=C9=C4=D5 =D4=CF=D4 changelog, =CB=CF=D4=CF=D2=D9= =CA =D1 =D0=CF=D4=CF=CD =D7 spec =CE=C1=D0=C9=DB=D5. =F1, =CB=CF=CE=C5=DE= =CE=CF, > =CD=CF=C7=D5 =D7=CF=D3=D0=CF=CC=D8=DA=CF=D7=C1=D4=D8=D3=D1 svn log -- =CE= =CF =DC=D4=CF =CB=C1=CB-=D4=CF =CE=C5=C1=CB=CB=D5=D2=C1=D4=CE=C5=CE=D8=CB= =CF. =F0=CF=D0=D2=CF=C2=D5=CA=D4=C5 =DE=D4=CF-=CE=C9=C2=D5=C4=D8 =D7=D2=CF=C4=C5 git-log HEAD^.. =F3=CD. git-rev-parse(1) =CE=C1 =D4=C5=CD=D5 "SPECIFYING REVISIONS". > >> =E9 =C5=DD=A3 =D7=CF=D0=D2=CF=D3: =D1 =D3=C9=CE=C8=D2=CF=CE=C9=DA=C9= =D2=D5=C0 =D3 =D0=CF=CD=CF=DD=D8=C0 git-svn =CF=D4=C4=C5=CC=D8=CE=D5=C0 =D7= =C5=D4=CB=D5. =F7 master > >> branch =D1 =C4=C5=CC=C1=C0 git mv =CE=C1 =D7=D3=C5 =C6=C1=CA=CC=D9 =D7= =CF=D4=C4=C5=CC=D8=CE=D9=CA =CB=C1=D4=C1=CC=CF=C7. =E5=D3=D4=C5=D3=D4=D7= =C5=CE=CE=CF =CB=CF=C7=C4=C1 > >> =D7 =C1=D0=D3=D4=D2=C9=CD=C5 =D0=CF=D1=D7=CC=D1=C5=D4=D3=D1 =CE=CF=D7= =D9=CA =C6=C1=CA=CC, =CF=CE =D0=CF=D1=D7=CC=D1=C5=D4=D3=D1 =D5 =CD=C5=CE=D1= =D7=CE=C5 =DC=D4=CF=C7=CF =CB=C1=D4=C1=CC=CF=C7=C1 > >> =D0=CF=D3=CC=C5 merge. > DVL> =FC=D4=CF =C4=C5=CA=D3=D4=D7=C9=D4=C5=CC=D8=CE=CF =CF=DE=C5=CE=D8 = =CE=C5=D5=C4=CF=C2=CE=CF. =F1 =D3=D4=C1=D2=C1=C0=D3=D8 =C4=C5=CC=C1=D4=D8 = =D4=C1=CB, =DE=D4=CF=C2=D9 =C4=C5=D2=C5=D7=CF > DVL> =CB=C1=D4=C1=CC=CF=C7=CF=D7 =C2=D9=CC=CF =CF=C4=C9=CE=C1=CB=CF=D7=D9= =CD. >=20 > =EB=C1=CB=C9=CD =CF=C2=D2=C1=DA=CF=CD?=20 =E5=D3=CC=C9 "=CE=C1 =D4=CF=CA =D3=D4=CF=D2=CF=CE=C5" =CE=C5=D4 =D0=CF=C4= =CB=C1=D4=C1=CC=CF=C7=C1, =D4=CF =D1 =D4=CF=D6=C5 =CE=C5 =D3=CF=DA=C4=C1=C0= =D0=CF=C4=CB=C1=D4=C1=CC=CF=C7. --=20 ldv --LpQ9ahxlCli8rRTG Content-Type: application/pgp-signature Content-Disposition: inline -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.5 (GNU/Linux) iD8DBQFFDcXAfKvmrJ41Nh4RAnWUAJ46MNr3/Wq8ceBpdasahOYOM3UuPACcCERO XsJpHl1PECHLZIr95s+rHX4= =7lwi -----END PGP SIGNATURE----- --LpQ9ahxlCli8rRTG--