DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG· RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT <http://issues.apache.org/bugzilla/show_bug.cgi?id=39890>. ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND· INSERTED IN THE BUG DATABASE.
http://issues.apache.org/bugzilla/show_bug.cgi?id=39890 ------- Additional Comments From [EMAIL PROTECTED] 2007-01-03 14:41 ------- (In reply to comment #6) > Created an attachment (id=19059) --> (http://issues.apache.org/bugzilla/attachment.cgi?id=19059&action=view) [edit] > updated previous patch to work with trunk > > Hi Joern, thanks for taking a look at it. > > I have updated the patch so that it works with the latest trunk, at least on > my > machine. jonathan, sorry for not getting back to you earlier. the patch still does not apply to my tree: [EMAIL PROTECTED]:/local/lenya> patch --dry-run -p0 < ~/Desktop/kupu_module_patch.diff (Stripping trailing CRs from patch.) patching file src/modules/kupu/kupu.js (Stripping trailing CRs from patch.) patching file src/modules/kupu/java/src/org/apache/lenya/cms/editors/kupu/Kupu.java Reversed (or previously applied) patch detected! Assume -R? [n] n Apply anyway? [n] n Skipping patch. 1 out of 1 hunk ignored -- saving rejects to file src/modules/kupu/java/src/org/apache/lenya/cms/editors/kupu/Kupu.java.rej (Stripping trailing CRs from patch.) patching file src/modules/kupu/config/cocoon-xconf/usecase-edit-kupu.xconf Reversed (or previously applied) patch detected! Assume -R? [n] n Apply anyway? [n] n Skipping patch. 1 out of 1 hunk ignored -- saving rejects to file src/modules/kupu/config/cocoon-xconf/usecase-edit-kupu.xconf.rej (Stripping trailing CRs from patch.) patching file src/modules/kupu/sitemap.xmap (Stripping trailing CRs from patch.) patching file src/webapp/global-sitemap.xmap Hunk #1 succeeded at 100 (offset 1 line). (Stripping trailing CRs from patch.) patching file src/webapp/lenya/usecases/kupu/usecase-kupu.xmap Reversed (or previously applied) patch detected! Assume -R? [n] n Apply anyway? [n] n Skipping patch. 1 out of 1 hunk ignored -- saving rejects to file src/webapp/lenya/usecases/kupu/usecase-kupu.xmap.rej (Stripping trailing CRs from patch.) patching file src/modules/xhtml/config/menu.xsp Hunk #1 FAILED at 50. 1 out of 1 hunk FAILED -- saving rejects to file src/modules/xhtml/config/menu.xsp.rej (Stripping trailing CRs from patch.) patching file src/pubs/default/modules/homepage/config/menus/homepage.xsp Hunk #1 succeeded at 45 (offset 1 line). looking at the patch, it seems to do the following: create a new src/modules/kupu/kupu.js (sounds ok) remove src/modules/kupu/java/src/org/apache/lenya/cms/editors/kupu/Kupu.java (sounds wrong) create src/modules/kupu/sitemap.xmap (sounds ok) patch src/webapp/global-sitemap.xmap to use the new module sitemap (sounds ok) remove src/webapp/lenya/usecases/kupu/usecase-kupu.xmap (sounds wrong) patch menu files (sounds ok) can you fix the patch? -- Configure bugmail: http://issues.apache.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the assignee for the bug, or are watching the assignee. --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
