From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Date: Sun, 10 Jun 2007 21:19:43 +0400 From: Sergey Vlasov To: devel@lists.altlinux.org Message-ID: <20070610171943.GA4826@procyon.home> Mail-Followup-To: devel@lists.altlinux.org References: <466A6E40.4040108@stc.donpac.ru> <679044850706090217i617d9bf1k914a873d1c76e908@mail.gmail.com> <466A72F7.80305@stc.donpac.ru> <75e139a00706100212t561494deq6d6908abb5aa44f8@mail.gmail.com> <466C2744.8010709@stc.donpac.ru> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="J/dobhs11T7y2rNN" Content-Disposition: inline In-Reply-To: <466C2744.8010709@stc.donpac.ru> Subject: Re: [devel] =?koi8-r?b?09LFxNPU18Egyc3Qz9LUwSDQ0s/Fy9TBINcgZ2l0IMna?= =?koi8-r?b?INTB0sLPzMzP1w==?= 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, 10 Jun 2007 17:20:17 -0000 Archived-At: List-Archive: List-Post: --J/dobhs11T7y2rNN Content-Type: text/plain; charset=koi8-r Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Sun, Jun 10, 2007 at 08:31:00PM +0400, Eugene Prokopiev wrote: > Slava Semushin =D0=C9=DB=C5=D4: > > 2007/6/9, Eugene Prokopiev : > > [...] > >=20 > >>>=F0=CF=D0=D2=CF=C2=D5=CA gear-update. > >> > >>$ gear-update -f -v ~/callweaver-1.1.99.20070609.tar.gz callweaver/ > >>error: 'callweaver/AUTHORS' has local modifications (hint: try -f) > >>... > >>error: 'callweaver/utils/streamplayer.c' has local modifications (hint: > >>try -f) > >=20 > >=20 > > =F1 =C2=D9 =D0=CF=D0=D2=CF=C2=CF=D7=C1=CC =D4=C1=CB: >=20 > =F0=CF=D1=D3=CE=C9=D4=C5, =D0=CF=D6=C1=CC=D5=CA=D3=D4=C1, =D3=CD=D9=D3=CC= =DC=D4=C9=C8 =CD=C1=CE=C9=D0=D5=CC=D1=C3=C9=CA >=20 > > $ PAGER=3Dcat git diff >back.diff >=20 > =D7=D9=D4=C1=D3=CB=C9=D7=C1=C5=CD =C9=DA=CD=C5=CE=C5=CE=C9=D1 (=CD=C5=D6= =C4=D5 =DE=C5=CD =C9 =DE=C5=CD?) =ED=C5=D6=C4=D5 index =C9 =C6=C1=CB=D4=C9=DE=C5=D3=CB=C9 =C9=CD=C5=C0=DD=C9= =CD=C9=D3=D1 =D7 =D2=C1=C2=CF=DE=C5=CA =CB=CF=D0=C9=C9 =C6=C1=CA=CC=C1=CD= =C9. =E8=CF=D4=D1 =D7 =C4=C1=CE=CE=CF=CD =D3=CC=D5=DE=C1=C5 =D3=CC=C5=C4=CF=D7=C1=CC=CF =C2=D9 = =CF=D4=CB=C1=D4=D9=D7=C1=D4=D8 =CE=C5 =CB =C9=CE=C4=C5=CB=D3=D5, =C1 =CB = =D0=CF=D3=CC=C5=C4=CE=C5=CD=D5 =CB=CF=CD=CD=C9=D4=D5 (HEAD). > =CB=D3=D4=C1=D4=C9, =D7=D9=D7=CF=C4 =D7=D9=C7=CC=D1=C4=C9=D4 =D4=C1=CB: >=20 > diff --git a/.gear-rules b/.gear-rules > diff --git a/callweaver-ael-macro.patch b/callweaver-ael-macro.patch > ... diff =C2=C5=DA =C6=C1=CB=D4=C9=DE=C5=D3=CB=CF=C7=CF =D3=CF=C4=C5=D2=D6=C9= =CD=CF=C7=CF =D7 =D7=D9=D7=CF=C4=C5 git-diff =D0=CF=D1=D7=CC=D1=C5=D4=D3=D1= =D7 =D3=CC=D5=DE=C1=C5, =CB=CF=C7=C4=C1 =C6=C1=CA=CC =D7 =D2=C1=C2=CF=DE=C5=CA = =CB=CF=D0=C9=C9 =CF=D4=CC=C9=DE=C1=C5=D4=D3=D1 =D0=CF mtime/inode =CF=D4 =D3=CF=C8=D2=C1=CE=A3=CE=CE=CF=C7=CF =D7 =C9=CE=C4=C5=CB=D3=C5, =CE=CF =CE= =C1 =D3=C1=CD=CF=CD =C4=C5=CC=C5 =D3=CF=D7=D0=C1=C4=C1=C5=D4 =D0=CF =D3=CF= =C4=C5=D2=D6=C9=CD=CF=CD=D5. =EF=C2=D9=DE=CE=CF =DC=D4=CF =D0=D2=CF=C9=D3=C8=CF=C4=C9=D4 =D7 =D3=CC=D5= =DE=C1=C5, =CB=CF=C7=C4=C1 =C6=C1=CA=CC =D2=C5=C4=C1=CB=D4=C9=D2=CF=D7=C1= =CC=C9, =CE=CF =DA=C1=D4=C5=CD =D7=C5=D2=CE=D5=CC=C9 =D7 =D0=C5=D2=D7=CF=CE=C1=DE=C1=CC=D8=CE=CF=C5 =D3=CF= =D3=D4=CF=D1=CE=C9=C5. =EB=D3=D4=C1=D4=C9, =D7=D9=DA=CF=D7 git status =D5=D3=D4=D2=C1=CE=C9=D4 =D7= =D3=C5 =CE=C5=D3=CF=D7=D0=C1=C4=C5=CE=C9=D1 =D2=C1=C2=CF=DE=C5=CA =CB=CF=D0= =C9=C9 =D3 =C9=CE=C4=C5=CB=D3=CF=CD =D4=C1=CB=CF=C7=CF =D2=CF=C4=C1 =C9 =D0=CF=CB=C1= =D6=C5=D4, =CB=C1=CB=C9=C5 =C6=C1=CA=CC=D9 =D2=C5=C1=CC=D8=CE=CF =C2=D9=CC= =C9 =CD=CF=C4=C9=C6=C9=C3=C9=D2=CF=D7=C1=CE=D9. > > $ PAGER=3Dcat git diff | patch -p1 -R >=20 > =D7=CC=C9=D7=C1=C5=CD =DC=D4=C9 =D6=C5 =C9=DA=CD=C5=CE=C5=CE=C9=D1 =D0=CF= =D7=C5=D2=C8 =D3=C1=CD=C9=C8 =D3=C5=C2=D1 (=D3=CD=D9=D3=CC =DC=D4=CF=C7=CF = =D7=CF=CF=C2=DD=C5 =CF=D4 =CD=C5=CE=D1=20 > =D5=D3=CB=CF=CC=D8=DA=C1=C5=D4) =EF=D0=C3=C9=D1 -R =CF=DA=CE=C1=DE=C1=C5=D4, =DE=D4=CF =C9=DA=CD=C5=CE=C5= =CE=C9=D1 =CF=D4=CB=C1=D4=D9=D7=C1=C0=D4=D3=D1. > =C9 =D0=CF=D3=CB=CF=CC=D8=CB=D5 =CE=C1 =D0=D2=C5=C4=D9=C4=D5=DD=C5=CD =DB= =C1=C7=C5 =CD=D9 =D0=CF=CC=D5=DE=C9=CC=C9 =CE=C5 =D3=CF=D7=D3=C5=CD diff, = =D4=CF=20 > =D2=C5=DA=D5=CC=D8=D4=C1=D4=CF=CD =DC=D4=CF=CA =CF=D0=C5=D2=C1=C3=C9=C9 = =D1=D7=CC=D1=C5=D4=D3=D1: >=20 > patch: **** Only garbage was found in the patch input. =EE=C1 =D3=C1=CD=CF=CD =C4=C5=CC=C5 =D7=CD=C5=D3=D4=CF patch -p1 -R =D3=CC= =C5=C4=CF=D7=C1=CC=CF =C9=D3=D0=CF=CC=D8=DA=CF=D7=C1=D4=D8 =D3=D2=C5=C4=D3= =D4=D7=C1, =C9=CD=C5=C0=DD=C9=C5=D3=D1 =D7 git: git apply -R (=C1 =D7 =C4=C1=CE=CE=CF= =CD =D3=CC=D5=DE=C1=C5 =C5=DD=A3 =C9 =D3 =CF=D0=C3=C9=C5=CA --index). =E1 =CB =D7=D9=DA=CF=D7=C1=CD git diff =D4=CF=C7=C4=C1 =D3=CC=C5= =C4=CF=D7=C1=CC=CF =C2=D9 =C4=CF=C2=C1=D7=C9=D4=D8 =CF=D0=C3=C9=C0 --binary - =D4=CF=C7=C4=C1 =DC=D4=CF =C2=D5=C4=C5=D4 =D2=C1=C2=CF=D4=C1=D4= =D8 =C9 =D7 =D3=CC=D5=DE=C1=C5, =CB=CF=C7=C4=C1 =C2=D9=CC=C9 =C9=DA=CD=C5= =CE=C5=CE=D9 =CE=C5 =D4=CF=CC=D8=CB=CF =D4=C5=CB=D3=D4=CF=D7=D9=C5 =C6=C1=CA=CC=D9. > > $ gear-update -f -v ~/callweaver-1.1.99.20070609.tar.gz callweaver/ >=20 > =D2=C5=DA=D5=CC=D8=D4=C1=D4 =C1=CE=C1=CC=CF=C7=C9=DE=C5=CE =D0=D2=C5=C4= =D9=C4=D5=DD=C5=CD=D5 gear-update, =CF=DB=C9=C2=CB=C9 =D4=C5 =D6=C5: >=20 > error: 'callweaver/AUTHORS' has local modifications (hint: try -f) > error: 'callweaver/BUGS' has local modifications (hint: try -f) > ... >=20 > > $ patch -p1 =20 > =C5=DD=C5 =D2=C1=DA =CE=C1=CB=C1=D4=D9=D7=C1=C5=CD =D3=CF=C8=D2=C1=CE=C5= =CE=CE=D9=C5 =C9=DA=CD=C5=CE=C5=CE=C9=D1 >=20 > > $ rm -f back.diff >=20 > =CE=D5 =DC=D4=CF =C5=C4=C9=CE=D3=D4=D7=C5=CE=CE=CF=C5, =DE=D4=CF =D0=CF= =CE=D1=D4=CE=CF :) >=20 > > =EE=CF, =D3=CB=CF=D2=C5=C5 =D7=D3=C5=C7=CF =DC=D4=CF =CE=C5 =D3=C1=CD= =CF=C5 =CC=D5=DE=DB=C5=C5 =D2=C5=DB=C5=CE=C9=C5. >=20 > =C4=C1, =D7=D9=C7=CC=D1=C4=C9=D4 =D0=D2=CF=D3=D4=CF =D6=D5=D4=CB=CF ... =F7=CF=CF=C2=DD=C5 =D7 git@ =CE=C5=C4=C1=D7=CE=CF =D0=D2=C5=C4=CC=C1=C7=C1= =CC=C1=D3=D8 =D2=C5=C1=CC=C9=DA=C1=C3=C9=D1 =CB=CF=CD=C1=CE=C4=D9 git-stash, =D0=CF=DA=D7=CF=CC=D1=C0=DD=C5=CA =D3=CF=C8=D2=C1=CE=C9=D4=D8 =C9 =D7=D2=C5= =CD=C5=CE=CE=CF =D5=C2=D2=C1=D4=D8 =CC=CF=CB=C1=CC=D8=CE=D9=C5 =C9=DA=CD=C5= =CE=C5=CE=C9=D1 =C9=DA =D2=C1=C2=CF=DE=C5=CA =CB=CF=D0=C9=C9, =C1 =D0=CF=D4=CF=CD =C9=C8 =D7=CF=D3=D3=D4=C1=CE=CF=D7=C9= =D4=D8 (=D7=CF=DA=CD=CF=D6=CE=CF, =CE=C1=CC=CF=D6=C9=D7 =D5=D6=C5 =CE=C1 = =CF=C2=CE=CF=D7=CC=A3=CE=CE=D5=C0 =D7=C5=D2=D3=C9=C0). --J/dobhs11T7y2rNN Content-Type: application/pgp-signature; name="signature.asc" Content-Description: Digital signature Content-Disposition: inline -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.6 (GNU/Linux) iD8DBQFGbDKvW82GfkQfsqIRAvMbAKCONB/lEIsqXvtM0Px46u7CHBRowwCgj4pu 8zccwgjgERBpMFuPiuwkJEg= =FlXu -----END PGP SIGNATURE----- --J/dobhs11T7y2rNN--