From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Date: Tue, 17 Oct 2006 05:27:26 +0400 From: Alexey Tourbin To: devel@lists.altlinux.org Message-ID: <20061017012726.GL8037@localhost.localdomain> Mail-Followup-To: devel@lists.altlinux.org Mime-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="NZiXfHLGvOGtDZMn" Content-Disposition: inline Subject: [devel] git-merge tree strategy 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: Tue, 17 Oct 2006 01:27:28 -0000 Archived-At: List-Archive: List-Post: --NZiXfHLGvOGtDZMn Content-Type: text/plain; charset=koi8-r Content-Disposition: inline Content-Transfer-Encoding: quoted-printable =F0=D2=C9 =C9=CD=D0=CF=D2=D4=C5 =D3 =D0=CF=CD=CF=DD=D8=C0 parsecvs =CB=CF= =CD=CD=C9=D4=D9 =CD=CF=C7=D5=D4 =CF=D4=CC=C9=DE=C1=D4=D8=D3=D1 (=CE=C1=D0= =D2=C9=CD=C5=D2, =DA=C1 =D3=DE=C5=D4 =CD=CF=C4=C9=C6=C9=CB=C1=C3=C9=C9 =D3=D0=C9=D3=CB=C1 Au= thors), =CE=CF =D3=CF=CF=D4=D7=C5=D4=D3=D4=D7=D5=C0=DD=C9=C5 =C9=CD =C4=C5= =D2=C5=D7=D8=D1 =CF=C4=C9=CE=C1=CB=CF=D7=D9=C5. =F4=C5=D0=C5=D2=D8 =CD=CE=C5 =CE=D5=D6=CE=CF =D3=CC=C9=D4=D8 =C4=D7=C1 =C4= =C5=D2=C5=D7=C1: =D7=D3=C5 =CB=CF=CD=CD=C9=D4=D9 =D2=C1=DA=CE=D9=C5, =CE=CF= =D7=D3=C5 =C4=C5=D2=C5=D7=D8=D1 =D3=CF=D7=D0=C1=C4=C1=C0=D4. * new-cvs * commitV * commitU * commitT * cvs * commitS * commit9 --> tree9 <-- * commitR * commit8 --> tree8 <-- * commitQ * commit7 --> tree7 <-- * commitP ................................. * commit0 --> tree0 <-- * commitA | | =09 --- --- =F3=D4=D2=C1=D4=C5=C7=C9=D1 =D3=CC=C9=D1=CE=C9=D1 recursive =C9=DD=C5=D4 = =CF=C2=DD=C5=C7=CF =D0=D2=C5=C4=CB=C1 =D0=CF =CB=CF=CD=CD=C9=D4=C1=CD =C9 = =CE=C5 =CE=C1=C8=CF=C4=C9=D4; =D0=CF=DC=D4=CF=CD=D5 =D0=D2=C9 =DA=C1=CC=C9=D7=C1=CE=C9=C9 new-cvs =D7 cvs= =C6=C1=CB=D4=C9=DE=C5=D3=CB=C9 =C4=C5=CC=C1=C5=D4=D3=D1 =DE=C5=D2=D4=C9-= =DE=D4=CF: =D0=D2=CF=C9=D3=C8=CF=C4=C9=D4 =CF=D4=CB=C1=D4 =CE=C1 =D3=C1=CD=CF=C5 =CE= =C1=DE=C1=CC=CF cvs =C9 =C4=C1=CC=D8=DB=C5 =D0=C1=D4=DE-=DA=C1-=D0=C1=D4=DE= =C5=CD =D0=D2=C9=CD=C5=CE=D1=C0=D4=D3=D1 =CB=CF=CD=CD=C9=D4=D9 =C9=DA new-cvs. =FA=C1=CB=C1=CE=DE=C9=D7=C1=C5=D4=D3= =D1 =DC=D4=CF =D5=D3=D0=C5=DB=CE=DB=CF (=D0=CF=D4=CF=CD=D5 =DE=D4=CF =D7=D3= =C5 =D0=C1=D4=DE=C9 =D3=CF=D7=D0=C1=C4=C1=C0=D4), =CE=CF =D0=CF=CC=D5=DE=C1=C5=D4=D3=D1 =D3=CF= =D7=D3=C5=CD =CE=C5=CB=D2=C1=D3=C9=D7=CF. =ED=CE=C5 =CE=D5=D6=CE=C1 =D3=D4=D2=C1=D4=C5=C7=C9=D1, =CB=CF=D4=CF=D2=C1= =D1 =C4=CF=CA=C4=C5=D4 =C4=CF commit9/commitR, =D5=D7=C9=C4=C9=D4 =D5 =CE= =C9=C8 =CF=C4=C9=CE=C1=CB=CF=D7=CF=C5 =C4=C5=D2e=D7=CF tree9 =C9 =D0=CF=CA=C4=C5= =D4 =D2=C1=D3=CB=D2=D5=DE=C9=D7=C1=D4=D8 "=CB=C1=CB =C2=D9 fast-worward", =D7=CC=C9=D7=C1=D1 =D7 cvs commitS..commitV. =E5=D3=D4=D8 =D4=C1=CB=C1=D1 =D3=D4=D2=C1=D4=C5=C7=C9=D1? (=F1 =D0=CF=CE=C9=CD=C1=C0, =DE=D4=CF =CD=CF=D6=CE=CF =D3=C4=C5=CC=C1=D4=D8= rebase, =D4.=C5. "=CE=C1=D3=C1=C4=C9=D4=D8" commitS..commitV =D0=D2=D1=CD=CF =CE=C1 =C2=D2=C1=CE=DE cvs. =EE=CF =DC=D4=CF =D7=D3=A3 =D6= =C5 =D2=D5=DE=CE=C1=D1 =D2=C1=C2=CF=D4=C1 =D0=CF =CE=C1=C8=CF=D6=C4=C5=CE= =C9=C0 =CF=C2=DD=C5=C7=CF =C4=C5=D2=C5=D7=C1.) --NZiXfHLGvOGtDZMn Content-Type: application/pgp-signature Content-Disposition: inline -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.5 (GNU/Linux) iD8DBQFFNDF+fBKgtDjnu0YRAhASAJ9bG8SY0k4b1Pqhr15aRwjkZ/WuBACfXbvv pyeERpjoyjLEQdxI0vbztfI= =16lZ -----END PGP SIGNATURE----- --NZiXfHLGvOGtDZMn--