From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Message-ID: <461B3E52.2010208@stc.donpac.ru> Date: Tue, 10 Apr 2007 11:35:46 +0400 From: Eugene Prokopiev User-Agent: Mozilla/5.0 (X11; U; Linux i686; ru-RU; rv:1.7.2) Gecko/20040808 X-Accept-Language: ru-ru, ru MIME-Version: 1.0 To: ALT Devel discussion list References: <461A80BC.30606@stc.donpac.ru> <20070409195227.GT9264@solemn.turbinal> <20070409200151.GB23196@basalt.office.altlinux.org> <20070409203755.GV9264@solemn.turbinal> <461B23AC.1060407@stc.donpac.ru> In-Reply-To: <461B23AC.1060407@stc.donpac.ru> Content-Type: text/plain; charset=KOI8-R; format=flowed X-DSPAM-Result: Whitelisted X-DSPAM-Processed: Tue Apr 10 11:36:26 2007 X-DSPAM-Confidence: 0.9899 X-DSPAM-Probability: 0.0000 X-DSPAM-Signature: 119,461b3e7a56603591520964 X-DSPAM-Factors: 27, Я, 0.01000, src+rpm, 0.01000, Received*Postfix+with, 0.01000, Date*Apr, 0.01000, Т+е, 0.01000, Received*Tue, 0.01000, init+db, 0.01000, С, 0.01000, git+init, 0.01000, Content-Type*text+plain, 0.01000, User-Agent*ru-RU+rv, 0.01000, Received*ESMTP, 0.01000, Content-Transfer-Encoding*8bit, 0.01000, dbmail, 0.01000, dbmail, 0.01000, с, 0.01000, с, 0.01000, To*Devel, 0.01000, User-Agent*X11+U, 0.01000, References*basalt.office.altlinux.org, 0.01000, это, 0.01000, Date*10+Apr, 0.01000, этого, 0.01000, что, 0.01000, что, 0.01000, User-Agent*U, 0.01000, Евгений, 0.01000 Content-Transfer-Encoding: quoted-printable 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: Tue, 10 Apr 2007 07:36:29 -0000 Archived-At: List-Archive: List-Post: > 2) =EB=C1=D4=C1=CC=CF=C7 =D3 =C9=D3=C8=CF=C4=CE=C9=CB=C1=CD=C9 =CF=DE=C9= =DD=C1=C5=CD =C9 =C4=C5=CC=C1=C5=CD =D7 =CE=C5=C7=CF git-pull =C9=DA =D4=D2= =C5=C2=D5=C5=CD=CF=C7=CF=20 > =C1=D0=D3=D4=D2=C9=CD=CE=CF=C7=CF =C2=D2=C1=CE=DE=C1 (=C9=CC=C9 git-svn= import/git-cvsimport) - =CD=CE=C5 =D7=D3=C5-=D4=C1=CB=C9=20 > =D5=C4=CF=C2=CE=C5=C5 =C4=C5=D2=D6=C1=D4=D8 =C9=D3=C8=CF=C4=CE=C9=CB=C9= =CF=D4=C4=C5=CC=D8=CE=CF. =EB=CF=C7=C4=C1 =CF=D3=CE=CF=D7=CE=D9=CD =D0=CF= =C4=C4=C5=D2=D6=C9=D7=C1=C5=CD=D9=CD=20 > =C1=D0=D3=D4=D2=C9=CD=CE=D9=CD =C2=D2=C1=CE=DE=C5=CD =D3=D4=C1=CE=C5=D4= =C4=D2=D5=C7=CF=CA, =D5=C4=C1=CC=D1=C5=CD =D7=D3=C5 =C9=DA =CB=C1=D4=C1=CC= =CF=C7=C1 =C9 =C4=C5=CC=C1=C5=CD =D7=20 > =CE=C5=C7=CF git-pull =C9=DA =DC=D4=CF=C7=CF =CE=CF=D7=CF=C7=CF =C2=D2=C1= =CE=DE=C1. =C7=CC=C1=C4=CB=CF =C2=D9=CC=CF =CE=C1 =C2=D5=CD=C1=C7=C5 ... $ git-init-db $ gear-srpmimport --branch=3Dmaster ~/RPM/SRPMS/dbmail-2.2.4-alt1.src.rpm $ cd dbmail/ $ rm -rf * $ git-pull http://nfg3.nfgs.net/git/dbmail.git dbmail_2_2: got 149777bf14442d761d3f0a5c443d1b5c27016305 100% (533/533) done Auto-merged dbmail.conf CONFLICT (add/add): Merge conflict in dbmail.conf Automatic merge failed; fix conflicts and then commit the result. =F5 =CD=C5=CE=D1 =C5=D3=D4=D8 =D3=D7=CF=CA dbmail.conf, =CB=CF=D4=CF=D2=D9= =CA =C9=C4=C5=D4 =D7 =D0=C1=CB=C5=D4, =C1 =C5=D3=D4=D8 =D4=C1=CB=CF=CA =D6= =C5 =C6=C1=CA=CC=20 =D7 =C9=D3=C8=CF=C4=CE=C9=CB=C1=C8, =CB=CF=D4=CF=D2=D9=CA =D1 =CE=C5 =CF=D0= =C1=CB=C5=DE=C9=D7=C1=C0 - =D3=CF=C2=D3=D4=D7=C5=CE=CE=CF, =DC=D4=CF =D4=CF= =CC=D8=CB=CF =CF=C4=CE=C1 =C9=DA=20 =D0=D2=C9=DE=C9=CE =C4=C5=D2=D6=C1=D4=D8 =C9=D3=C8=CF=C4=CE=C9=CB=C9 =C1=D0= =D3=D4=D2=C9=CD=C1 =D7 =CF=D4=C4=C5=CC=D8=CE=CF=CD =CB=C1=D4=C1=CC=CF=C7=C5= . =E9=CE=D4=C5=D2=C5=D3=CE=CF, =DE=D4=CF git-pull =D7=D9=C7=D2=D5=DA=C9=CC = =D7=D3=C5, =DE=D4=CF =C5=CD=D5 =D0=CF=CC=C1=C7=C1=C5=D4=D3=D1 =CE=C5 =D7 = =D4=C5=CB=D5=DD=C9=CA=20 =CB=C1=D4=C1=CC=CF=C7, =C1 =D7 =CB=C1=D4=C1=CC=CF=C7, =D7 =CB=CF=D4=CF=D2= =CF=CD =C5=D3=D4=D8 .git, =D4.=C5. =D5=D2=CF=D7=CE=C5=CD =D7=D9=DB=C5. =E4=CF =D4=CF=C7=CF =D1 =C9=D3=D0=CF=CC=D8=DA=CF=D7=C1=CC git-rm -r -f db= mail/* =D7=CD=C5=D3=D4=CF cd dbmail/; rm -rf *,=20 =CF=C4=CE=C1=CB=CF =D0=CF=D0=D5=D4=CE=CF =C2=D9=CC =D5=C4=C1=CC=C5=CE =D3= =C1=CD =CB=C1=D4=C1=CC=CF=C7 dbmail. =F1 =D3=CF=DA=C4=C1=CC =C5=C7=CF =DA= =C1=CE=CF=D7=CF, =CE=CF=20 =CB=C1=CB =C4=CF=C2=C1=D7=C9=D4=D8 =D3 =D0=CF=CD=CF=DD=D8=C0 git-add, =CE= =C5 =D0=CF=CE=D1=CC: git-add =D5=D4=D7=C5=D2=D6=C4=C1=C5=D4, =DE=D4=CF =CF= =CE=20 =D5=CD=C5=C5=D4 =C4=CF=C2=C1=D7=CC=D1=D4=D8 =D4=CF=CC=D8=CB=CF =C6=C1=CA=CC= =D9 =C9 =D3=C9=CD=CC=C9=CE=CB=C9. =F7=D9=DA=CF=D7 git-pull =D0=CF=D3=CC=C5= cd =D7 =DC=D4=CF=D4=20 =CB=C1=D4=C1=CC=CF=C7 =D0=D2=C9=D7=CF=C4=C9=D4 =CB =D2=C5=DA=D5=CC=D8=D4=C1= =D4=C1=CD, =D0=CF=CB=C1=DA=C1=CE=CE=D9=CD =D7=D9=DB=C5. =F4.=C5. =C9=CC=C9 =D7=D3=C5 =D7 =CF=C4=CE=CF=CD =C2=D2=C1=CE=DE=C5 =C9 =D7= =CF=C4=CE=CF=CD =CB=C1=D4=C1=CC=CF=C7=C5, =C9=CC=C9 =D7 =D2=C1=DA=CE=D9=C8= =C2=D2=C1=CE=DE=C1=C8=20 (+=CE=C5=C2=C8=CF=C4=C9=CD=CF=D3=D4=D8 merge)? --=20 =F3 =D5=D7=C1=D6=C5=CE=C9=C5=CD, =F0=D2=CF=CB=CF=D0=D8=C5=D7 =E5=D7=C7=C5= =CE=C9=CA