From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <solo@altlinux.ru>
Message-ID: <453FA1E9.6090208@altlinux.ru>
Date: Wed, 25 Oct 2006 21:42:01 +0400
From: Aleksey Avdeev <solo@altlinux.ru>
User-Agent: Mozilla Thunderbird 1.0.6 (X11/20050815)
X-Accept-Language: ru-ru, ru
MIME-Version: 1.0
To: ALT Devel discussion list <devel@lists.altlinux.org>
References: <453E9D9A.2040501@altlinux.ru> <453F3703.5020302@altlinux.ru>
	<453F96E5.4000109@altlinux.ru>
In-Reply-To: <453F96E5.4000109@altlinux.ru>
Content-Type: text/plain; charset=koi8-r
Content-Transfer-Encoding: quoted-printable
Subject: Re: [devel] Apache2 with libdb4.4
X-BeenThere: devel@lists.altlinux.org
X-Mailman-Version: 2.1.9rc1
Precedence: list
Reply-To: ALT Devel discussion list <devel@lists.altlinux.org>
List-Id: ALT Devel discussion list <devel.lists.altlinux.org>
List-Unsubscribe: <https://lists.altlinux.org/mailman/listinfo/devel>,
	<mailto:devel-request@lists.altlinux.org?subject=unsubscribe>
List-Archive: <http://lists.altlinux.org/pipermail/devel>
List-Post: <mailto:devel@lists.altlinux.org>
List-Help: <mailto:devel-request@lists.altlinux.org?subject=help>
List-Subscribe: <https://lists.altlinux.org/mailman/listinfo/devel>,
	<mailto:devel-request@lists.altlinux.org?subject=subscribe>
X-List-Received-Date: Wed, 25 Oct 2006 17:42:18 -0000
Archived-At: <http://lore.altlinux.org/devel/453FA1E9.6090208@altlinux.ru/>
List-Archive: <http://lore.altlinux.org/devel/>
List-Post: <mailto:devel@altlinux.org>

Sviatoslav Sviridov =D0=C9=DB=C5=D4:
> =F0=C5=D2=C5=D3=D9=CC=C1=C0 =D7 devel.

  OK

>=20
> =F7=CB=D2=C1=D4=C3=C5: apach2, =D0=C5=D2=C5=D3=CF=C2=D2=C1=CE=CE=D9=CA =
=D3 libdb4.4, =C1 =D4=C1=CB=D6=C5 subversion-1.4
> =CF=D4=D0=D2=C1=D7=CC=C5=CE=D9 =D7 /incoming/Daedalus/

  OK

>=20
> Aleksey Avdeev wrote on 10/25/2006 1:05 PM:
>=20
=2E..
>>
>>1. =F0=C5=D2=C5=CE=CF=D3 =D7 git. =E5=D3=D4=D8 =C9=C4=C5=D1 =DA=C1=D4=C1=
=DD=C9=D4=D8 =D4=D5=C4=C1 =D3=CF=C4=C5=D2=D6=C9=CD=CF=C5 =C5=C7=CF =D2=CF=
=C4=CE=CF=C7=CF svn.
>>
>>  =F0=D2=CF=C2=CC=C5=CD=C1 =D7 =D4=CF=CD, =DE=D4=CF =D0=D2=C9 =CC=CF=C2=
=CF=D7=CF=CD =D0=D2=C9=CD=C5=CE=C5=CE=C9=C9 git-svn =D7 =CB=CF=CE=C5=DE=CE=
=CF=CD
>>=D2=C5=DA=D5=CC=D8=D4=C1=D4=C5 =D3=CF=C8=D2=C1=CE=C5=CE=D9 =D7=D3=C5 =CB=
=CF=CD=CD=C9=D4=D9, =CE=CF =D4=C5=D2=D1=C0=D4=D3=D1 =D3=D7=D1=DA=C9 =CD=C5=
=D6=C4=D5 =CE=C9=CD=C9 (=C2=CF=CC=D8=DB=CF=CA
>>=D0=D2=CF=C5=CB=D4, =D3=CF =D3=CC=CF=D6=CE=CF=CA =D3=D4=D2=D5=CB=D4=D5=D2=
=CF=CA). =F0=D5=D4=C9 =D2=C5=DB=C5=CE=C9=D1 =CE=C1=DD=D5=D0=C1=CC (=D7 =CB=
=D2=C1=C3=C5): =D7=D9=C4=C5=CC=C9=D4=D8
>>=D7=C5=D4=CB=C9 =D7 =D2=D5=DE=CE=D5=C0 =C9 =D0=C1=D2=D3=C9=D4=D8 =CC=CF=
=C7 =C4=CC=D1 =C9=C8 =D3=CC=C9=D1=CE=C9=D1 =D3=D2=C5=C4=D3=D4=D7=C1=CD=C9=
 git, git-svn
>>=D0=D2=C9=CD=C5=CE=D1=D4=D8 =CB =D7=C5=D4=CB=C1=CD =CD=C5=D6=C4=D5 =D4=CF=
=DE=CB=C1=CD=C9 =D3=CC=C9=D1=CE=C9=CA. =EE=CF =CE=C1 =D2=C5=C1=CC=C9=DA=C1=
=C3=C9=C9 -- =D0=CF=CB=C1 =DA=C1=D3=D4=D2=D1=CC.
>=20
>=20
> =E4=CC=D1 =CD=C5=CE=D1 =D4=CF=D6=C5 =CF=D3=D4=C1=C5=D4=D3=D1 =CE=C5 =D3=
=CF=D7=D3=C5=CD =D1=D3=CE=D9=CD =CD=CF=D6=CE=CF =CC=C9 =C2=CF=CC=C5=C5-=CD=
=C5=CE=C5=C5 =D0=D2=C9=C5=CD=CC=C9=CD=CF
> =C9=D3=D0=CF=CC=D8=DA=CF=D7=C1=D4=D8 git-svn =D3 =D2=C5=C1=CC=D8=CE=D9=CD=
 svn =D2=C5=D0=CF=DA=C9=D4=CF=D2=C9=C5=CD =C8=CF=D4=D1 =C2=D9 =C4=CC=D1 =D4=
=CF=C7=CF, =DE=D4=CF=C2=D9
>  =D7 =CF=D4=C4=C5=CC=D8=CE=D9=CA =C2=D2=C1=CE=DE =D7 git =DA=C1=D4=C1=D3=
=CB=C9=D7=C1=D4=D8 =C9=D3=C8=CF=C4=CE=C9=CB=C9 =C9=DA svn, =CE=CF =D4=CF=CC=
=D8=CB=CF =D0=CF
> =D4=C5=C7=C1=CD. =EE=C1=D3=CB=CF=CC=D8=CB=CF =D1 =D0=CF=CE=D1=CC, =C9=C7=
=D2=D9 =D3 GIT_SVN_ID =D7=C5=C4=D5=D4 =CB =D3=CF=DA=C4=C1=CE=C9=C0
> =D3=CF=CF=D4=D7=C5=D4=D3=D4=D7=D5=C0=DD=C5=C7=CF =CB=CF=CC=C9=DE=C5=D3=D4=
=D7=C1 =CF=D4=C4=C5=CC=D8=CE=D9=C8 =C2=D2=C1=CE=DE=C5=CA... =C9=DA =CB=CF=
=D4=CF=D2=D9=C8, =CB=CF=CE=C5=DE=CE=CF,
> =D0=CF=D4=CF=CD =CD=CF=D6=CE=CF =D7=D9=D4=C1=D3=CB=C9=D7=C1=D4=D8 =D7 =CF=
=C4=C9=CE, =CE=CF =D7=D3=C5 =D2=C1=D7=CE=CF =CB=C1=CB-=D4=CF =CE=C5 =CF=DE=
=C5=CE=D8 =C9=CE=D4=C5=D2=C5=D3=CE=CF
> =DC=D4=CF =D7=D9=C7=CC=D1=C4=C9=D4...

  =F0=D2=C9=CD=C5=CE=D1=D4=D8 git-svn =CE=C1 =D0=D2=CF=D3=D4=D9=C8 =D5=DE=
=C1=D3=CB=C1=C8, =C7=C4=C5 =CE=C5=D4 =CB=CF=D0=C9=D2=CF=D7=C1=CE=C9=CA/=D3=
=CC=C9=D1=CE=C9=CA (=D7
=CC=CF=C7=C5 =D7=C9=C4=CE=CF =CB=C1=CB "{A,R} <=CB=D5=C4=C1> (from <=CF=D4=
=CB=D5=C4=C1>:<=D2=C5=D7=C9=DA=C9=D1>)") =C9=DA =D7=D4=C1=DD=C5=CE=CE=D9=C8=
 =D7
git =D7=C5=D4=CF=CB, =CD=CF=D6=CE=CF.

 =EE=C1 =D5=DE=C1=D3=D4=CB=C1=C8 =D3 =CB=CF=D0=C9=D2=CF=D7=C1=CE=C9=D1=CD=
=C9/=D3=CC=C9=D1=CE=C9=D1=CD=C9 =D0=CF=C8=CF=D6=C5 =CE=C1=C4=CF =D7=D9=D0=
=CF=CC=CE=D1=D4=D8 =DE=D4=CF-=D4=CF =D4=C9=D0=C1
(=CF=C2=DD=C9=CA =D3=CC=D5=DE=C1=CA):

1. git-merge --no-commit <msg> <=CB=D5=C4=C1> <=CF=D4=CB=D5=C4=C11> ... <=
=CF=D4=CB=D5=C4=C1N>

  =C7=C4=C5 <=CB=D5=C4=C1> -- =D0=CF=D3=CC=C5=C4=CE=C9=CA commit =D0=D2=C5=
=C4=D9=C4=D5=DD=C5=C7=CF =DB=C1=C7=C1, =C1 <=CF=D4=CB=D5=C4=C11> ...
<=CF=D4=CB=D5=C4=C1N> -- commit`=D9 =D3=CF=CF=D4=D7=C5=D4=D3=D4=D7=D5=C0=DD=
=C9=C5 svn`=CF=D7=D3=CB=C9=CD <=CF=D4=CB=D5=C4=C1X>:<=D2=C5=D7=C9=DA=C9=D1=
X>
(=D4=CF=DE=CE=C5=C5 =C2=CC=C9=D6=C1=CA=DB=C5=CD=D5 commit, =D0=CF=D3=CC=C5=
 =CB=CF=D4=CF=D2=CF=C7=CF =D7 =D7=C5=D4=CB=C5 <=CF=D4=CB=D5=C4=C1X> =CE=C5=
 =C2=D9=CC=CF
=C9=DA=CD=C5=CE=C5=CE=C9=CA)

2. rm -rf *

3. =DA=C1=C7=D2=D5=DA=CB=C1 =D4=D2=C5=C2=D5=C5=CD=CF=C7=CF =C9=DA svn (=C9=
=CC=C9 =C4=D2=D5=C7=CF=C7=CF git-=D2=C5=D0=CF=DA=C9=D4=C1=D2=C9=D1 =D7=D9=
=D4=C1=DD=C5=CE=CE=CF=C7=CF
git-svn =D7 =D4=D5=D0=D5=C0 ;-))

4. git-commit, =D3 faketime =C9 =CB=CF=CD=CD=C5=CE=D4=C1=D2=C9=C5=CD =D7=DA=
=D1=D4=D9=CD=C9 =C9=DA =CC=CF=C7=C1 svn.

  =F0=D2=CF=C2=CC=C5=CD=C1 =D7 =D4=CF=CD, =DE=D4=CF =CB=CF=C4 =C4=CC=D1 =D0=
=D2=CF=D7=C5=D2=CB=C9 =C4=C1=CE=CE=CF=CA =C9=C4=C5=C9 =D1 =C5=DD=A3 =CE=C5=
 =D3=C4=C5=CC=C1=CC, =C1 =D7
=D2=D5=DE=CE=D5=C0 -- _=D3=CC=C9=DB=CB=CF=CD_ =C2=CF=CC=D8=DB=CF=CA =D0=D2=
=CF=C5=CB=D4...

--=20

=F3 =D5=D7=C1=D6=C5=CE=C9=C5=CD. =E1=CC=C5=CB=D3=C5=CA.