Re: [Libcdio-devel] [PATCH 1/4] Add read_iso_file helper function in iso-read

[Rocky Bernstein]

The first two patches are now in git. The next two cause tests to start
failing so that hasn't been applied yet.

On Fri, Oct 19, 2012 at 5:57 AM, Christophe Fergeau <address@hidden>wrote:

> Hi,
>
> On Thu, Oct 18, 2012 at 08:03:06PM -0400, Rocky Bernstein wrote:
> > I tried applying the first patch to current git sources
> > (ff3eb9f22d6138fc85695f55ff66ec2e4c3837dc) r and I get:
> >
> >   patching file src/iso-read.c
> >   Hunk #1 FAILED at 200.
> >   Hunk #2 FAILED at 274.
> >   2 out of 2 hunks FAILED -- saving rejects to file src/iso-read.c.rej
> >
> > The file iso-read.c.rej is something that isn't easy to manually adjust
> > for. Could you try patching again against git source ffeb9f22 ... ?
>
> They were based on a slightly older version of master, I've now rebased
> them on top of ff3eb9f
>
> >
> > Also please send the patch as an attachment. You can also attach patches
> as
> > a file at http://savannah.gnu.org/patch/?group=libcdio
>
> I'm attaching the four patches to this email, and I've added them to
> https://savannah.gnu.org/patch/index.php?7865 as well. I can push a git
> repository with these patches somewhere online if you still have troubles
> getting to these patches.
>
> > This saves me the trouble of cutting and pasting email which is a
> potential
> > source of problem.
>
> I think you should be able to save the raw email including all its headers
> and then use 'git am' to apply it. But some mailers indeed tend to make
> that complicated ;)
>
> Christophe
>