Jean T. Anderson wrote:
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
Hi Jean -
I think the 'svn up' might be the problem - I performed an 'svn co' to
refresh my local copy prior to making the changes and creating the DIFF
- would this sync up my copy? I will read up on these commands and may
follow-up with more questions. I'm a newbie to the PATCH process so
please bear with me.
John pointed out a typ-O that I can also fix before creating the new
patch. Should I delete the original DIFF file from the JIRA issue
because it is not correct and should not be used?
