script patch

[Jason Thomson]

Thanks for the svn tip. That was my problem, I was patching against the
wrong source.  I appreciate all your help.
Jason

On Thu, Jul 30, 2009 at 5:14 PM, Eugene Dorfman <eugene.dorfman at gmail.com>wrote:

> I am not very sure your patching went well.
>
> I checked out the cadaver source and applied patch:
> $ svn co http://svn.webdav.org/repos/projects/cadaver/trunk .
> $ patch -p0 -i ../cadaver.patch
> The output after patch was like this:
> patching file src/options.h
> patching file src/cadaver.c
> patching file src/cadaver.h
> patching file src/options.c
>
> So the downloaded source might have been not from trunk - and therefore
> might be a little different.
>
> 2009/7/31 Jason Thomson <schnogg at gmail.com>
>
> That's great! Thanks for the help. I  downloaded  your attachment.bin file.
>> It looks like ascii, so i'm assuming the file name makes no difference.
>> I issued the commands like this
>> tar -zxvf cadaver-0.23.2
>> cd cadaver-0.23.2
>> patch -p0 -i ~/Downloads/attachment.bin
>>
>> The output was
>> patching file src/options.h
>> patching file src/cadaver.c
>> Hunk #1 succeeded at 428 (offset -5 lines).
>> Hunk #2 FAILED at 441.
>> Hunk #3 succeeded at 476 (offset -7 lines).
>> Hunk #4 succeeded at 798 (offset -17 lines).
>> Hunk #5 FAILED at 881.
>> Hunk #6 succeeded at 1082 (offset -18 lines).
>> Hunk #7 succeeded at 1096 (offset -18 lines).
>> Hunk #8 succeeded at 1156 (offset -18 lines).
>> 2 out of 8 hunks FAILED -- saving rejects to file src/cadaver.c.rej
>> patching file src/cadaver.h
>> Hunk #1 succeeded at 175 (offset -15 lines).
>> patching file src/options.c
>> patch unexpectedly ends in middle of line
>> Hunk #1 succeeded at 107 with fuzz 1 (offset -2 lines).
>>
>> Does that seem right? I downloaded the source from webdav.org/cadaver.
>> I'm going to attempt a build now.
>> Thanks again.
>> Jason
>>
>> On Jul 30, 2009, at 4:57 PM, Eugene Dorfman wrote:
>>
>> Hi Jason
>>
>> You should type:
>>
>> $ patch -p0 -i ../cadaver.patch
>>
>> assuming your current dir is where the cadaver source resides and
>> cadaver.patch is one level up from that dir. cadaver.patch can be anywhere
>> in the filesystem, just make sure you specify correct path to it in the
>> command line.
>> Here is a nice post on creating and applying patches with subversion:
>> http://ariejan.net/2007/07/03/how-to-create-and-apply-a-patch-with-subversion/
>>
>> Hope I answered your question.
>>
>> 2009/7/30 Jason Thomson <schnogg at gmail.com>
>>
>>> Hi, I found your patch in the maliilng list archive from yesterday. Sorry
>>> for such a low-level question, but what would be the command to issue to
>>> insert this patch? is it patch -p0 attchment.bin cadaver.c ? I've never
>>> fully found a good reference for using patches, so I've only been lucky so
>>> far with building patched software.
>>> Thanks in advance
>>> Jason
>>>
>>>
>>
>>
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.manyfish.co.uk/pipermail/cadaver/attachments/20090803/3a329043/attachment-0007.html