From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <vsu@altlinux.ru>
Date: Thu, 19 Oct 2006 12:25:24 +0400
From: Sergey Vlasov <vsu@altlinux.ru>
To: ALT Devel discussion list <devel@lists.altlinux.org>
Message-ID: <20061019082524.GD31851@master.mivlgu.local>
Mail-Followup-To: ALT Devel discussion list <devel@lists.altlinux.org>
References: <20061018214405.GQ11317@localhost.localdomain>
	<679044850610182230p27bcbd1ewfde6afc98e035a31@mail.gmail.com>
Mime-Version: 1.0
Content-Type: multipart/signed; micalg=pgp-sha1;
	protocol="application/pgp-signature"; boundary="eheScQNz3K90DVRs"
Content-Disposition: inline
In-Reply-To: <679044850610182230p27bcbd1ewfde6afc98e035a31@mail.gmail.com>
Subject: Re: [devel] git-apply
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: Thu, 19 Oct 2006 08:25:40 -0000
Archived-At: <http://lore.altlinux.org/devel/20061019082524.GD31851@master.mivlgu.local/>
List-Archive: <http://lore.altlinux.org/devel/>
List-Post: <mailto:devel@altlinux.org>


--eheScQNz3K90DVRs
Content-Type: text/plain; charset=koi8-r
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable

On Thu, Oct 19, 2006 at 09:30:04AM +0400, Damir Shayhutdinov wrote:
> > git-apply =CE=C5 =C8=CF=DE=C5=D4 =D0=D2=C9=CB=CC=C1=C4=D9=D7=C1=D4=D8 =
=CE=C5=CB=CF=D4=CF=D2=D9=C5 =D0=C1=D4=DE=C9, =CB=CF=D4=CF=D2=D9=C5 =CE=CF=
=D2=CD=C1=CC=D8=CE=CF
> > =D0=D2=C9=CB=CC=C1=C4=D9=D7=C1=C5=D4 patch.
> >
> > $ patch -p1 --dry-run <~sources/zsh-4.0.4-rh-serial.patch
> > patching file Src/builtin.c
> > Hunk #1 succeeded at 4591 (offset 1102 lines).
> > patching file Src/init.c
> > Hunk #1 succeeded at 402 (offset 5 lines).
> > Hunk #2 succeeded at 443 (offset 5 lines).
> > Hunk #3 succeeded at 1348 with fuzz 1 (offset 113 lines).
> > $ git-apply ~sources/zsh-4.0.4-rh-serial.patch
> > error: patch failed: Src/init.c:1235
> > error: Src/init.c: patch does not apply
> > $
> =EE=C5 =CD=CF=C7=D5 =C5=C7=CF =D7 =DC=D4=CF=CD =D7=C9=CE=C9=D4=D8, =D1 =
=C2=D9 =D4=CF=D6=C5 =CE=C5 =D3=D4=C1=CC =D0=D2=C9=CB=CC=C1=C4=D9=D7=C1=D4=
=D8 =D0=C1=D4=DE=C9 =D3
> =CF=C6=C6=D3=C5=D4=CF=CD =D7 113 =D3=D4=D2=CF=CB.

Offset =CF=CE =CB=C1=CB =D2=C1=DA =D0=CF=CE=C9=CD=C1=C5=D4 =CE=CF=D2=CD=C1=
=CC=D8=CE=CF, =C1 =D7=CF=D4 fuzz =D0=D2=C9=CE=C3=C9=D0=C9=C1=CC=D8=CE=CF =
=CE=C5
=D0=C5=D2=C5=CE=CF=D3=C9=D4.  =ED=CF=D6=CE=CF, =D0=D2=C1=D7=C4=C1, =D0=CF=
=CB=D2=D5=D4=C9=D4=D8 =CF=D0=C3=C9=C0 -C.

--eheScQNz3K90DVRs
Content-Type: application/pgp-signature
Content-Disposition: inline

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.2.4 (GNU/Linux)

iD8DBQFFNzZ0W82GfkQfsqIRAuwoAJ9LZmI5zvSCQtoNDT3ucWIV1NViZQCeJKz1
EYRsd4b6FyQrkdiXITvFqlU=
=YWFa
-----END PGP SIGNATURE-----

--eheScQNz3K90DVRs--