When I tried to apply the original patch I got error messages back. I
can't recall the messages and I also can't reproduce them.

I tried to apply the original patch again today and got this:

patching file jpaproject.mdtext
Hunk #1 FAILED at 13.
patch: **** malformed patch at line 66: \ No newline at end of file

which is not what I got before. I must have done something wrong, but
I don't know what.

Alasdair

On 18 March 2011 14:45, zoe slattery <[email protected]> wrote:
> On 18/03/2011 14:19, Charles Moulliard wrote:
>>
>> Here is a new patch that you can use to make a test
>>
> OK - not exactly sure what you wanted me to do with this but this is what I
> did:
>
> Copied your file to patch.txt
> Changed directory to where my site is checked out (aries/site)
> cd content/modules
> patch < patch.txt
> used svn diff to check that it had been applied
> svn commit -m "Apply CM patch"
>
> So, this was pretty straightforward. The checkin generates a staging build
> of the site, your change is visible here:
>
> http://aries.staging.apache.org/modules/jpaproject.html
>
> So, I'm not sure what the issue was?
>
> Zoe
>
>> On Fri, Mar 18, 2011 at 3:14 PM, zoe slattery<[email protected]>
>>  wrote:
>>>>>
>>>>>  Then the committer applying the patch
>>>>> also needs the full site checked out and configured to build.
>>>>
>>>> This is not true. You should just be able to check out, apply patch,
>>>> commit and use the CMS tooling to verify.
>>>
>>> Hmm - on second thoughts - strictly speaking you are right.
>>>
>>> Z
>>>
>>>>>>
>>>
>
>



-- 
Alasdair Nottingham
[email protected]

Reply via email to