db-derby-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From "Jean T. Anderson" <...@bristowhill.com>
Subject Re: [jira] Updated: (DERBY-913) [WWD] Proposal to create and add Working With Derby, an activity-based tutorial document, to the Derby documentation set
Date Wed, 26 Apr 2006 02:58:58 GMT
Stan Bradbury (JIRA) wrote:
>      [ http://issues.apache.org/jira/browse/DERBY-913?page=all ]
> 
> Stan Bradbury updated DERBY-913:
> --------------------------------
> 
>     Attachment: 4COMMIT_wwd_Ch1-4.diff
>                 4COMMIT_wwd_Ch1-4.pdf
> 
> Document patch submitted to be committed:
> 
> FILE:  4COMMIT_wwd_Ch1-4.diff - the patch file:
>    Adds Chapters 3 and 4
>    Updates Chapters 1 and 2
>    Updates build.xml to correct build problems on Linux
> 
> FILE:  4COMMIT_wwd_Ch1-4.pdf
>   PDF document generated from the above patch files.  Can be used to review changes and
additions.
 ...
The patch is failing with hunk failures on the build.xml, which is a
little odd since this is just the second patch and you're the only one
doing patches right now:

   patching file build.xml

   Reversed (or previously applied) patch detected!  Assume -R? [n] y
   Hunk #2 FAILED at 36.
   Hunk #3 FAILED at 104.
   Hunk #4 succeeded at 154 (offset -3 lines).
   2 out of 4 hunks FAILED -- saving rejects to file build.xml.rej

Did you 'svn up' your working copy before creating the patch? I'll email
you the build.xml.rej separately.

 -jean

Mime
View raw message