[
http://issues.apache.org/struts/browse/STR-2900?page=comments#action_37642 ]
James Mitchell commented on STR-2900:
-------------------------------------
Sorry this is taking so long. Maybe I'm just doing it wrong, but I'm not sure
how you are creating the patch file. I'm getting a bunch of failures during
patch.
(this is only a small snip)
...
...
1 out of 1 hunk FAILED -- saving rejects to file
apps/examples/src/main/java/org/apache/struts/webapp/validator/LocaleAction.java.rej
patching file
apps/examples/src/main/java/org/apache/struts/webapp/validator/MultiRegistrationAction.java
Hunk #1 FAILED at 1.
1 out of 3 hunks FAILED -- saving rejects to file
apps/examples/src/main/java/org/apache/struts/webapp/validator/MultiRegistrationAction.java.rej
patching file
apps/examples/src/main/java/org/apache/struts/webapp/validator/RegistrationAction.java
Hunk #1 FAILED at 1.
...
...
Perhaps your files are not up to date or something.
Could you do the following?
$cd {to struts1/ dir}
$svn up (watch for any conflicts)
$svn diff -u > checkstyle.patch
This creates 1 single patch file from the same place that I will run patch.
Thanks again.
> Checkstyle patches
> ------------------
>
> Key: STR-2900
> URL: http://issues.apache.org/struts/browse/STR-2900
> Project: Struts 1
> Type: Improvement
> Components: Core, Apps, EL, Extras, Faces, Scripting, Taglibs, Tiles
> Versions: 1.3.1
> Environment: Any
> Reporter: Frank W. Zammetti
> Assignee: James Mitchell
> Attachments: all.patch, apps.zip, core.zip, el.zip, extras.zip, faces.zip,
> integration.zip, mailreader-dao.zip, scripting.zip, taglib.zip, tiles.zip
>
> This is a collection of patches which addresses about 2,150 Checkstyle
> complaints. Each ZIP file should be unzipped, and be sure to recreate
> directory structure! You will find a structure that matches the source repo.
> I created a single patch file for each package within each subproject that
> has changes, so it should be quite granular enough. Also note that there are
> some new package.html files in some places which should be added. I will be
> happy to do another round once these are applied.
--
This message is automatically generated by JIRA.
-
If you think it was sent incorrectly contact one of the administrators:
http://issues.apache.org/struts/secure/Administrators.jspa
-
For more information on JIRA, see:
http://www.atlassian.com/software/jira
