2012/5/16 Eric Charles <[email protected]>: > I tried. Editing seems to happen well, however commit gives > > A conflict in the working copy obstructs the current operation: Commit > failed (details follow):: Aborting commit: > '/usr/local/cms/wc/james/eric-k33oMU/trunk/content/server/config-users.mdtext' > remains in conflict at /usr/local/cms/webgui/lib/ASF/CMS/WC/Commit.pm line > 64
I was telling you about this problem earlier. You have an old working copy (see the mdtext file extension). I clicked Force new working copy on https://cms.apache.org/ but to be sure: - click on eric-k33oMU on the right part of the page (when you are editing with bookmarklet) - click update this directory to force a new working copy after this resume editing. Good luck, > > Thx, > Eric > > > On 05/16/2012 03:58 PM, Ioan Eugen Stan wrote: >> >> 2012/5/16 Eric Charles (JIRA)<[email protected]>: >>> >>> >>> [ >>> https://issues.apache.org/jira/browse/JAMES-1374?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=13276734#comment-13276734 >>> ] >>> >>> Eric Charles commented on JAMES-1374: >>> ------------------------------------- >>> >>> So we can still change the xml file and commit them, It will be >>> published. >>> >>> You say: "You can also edit the pages via browser (tried it, but had to >>> clean the working copy first via update link because I was getting mdtext >>> files), then commit from browser and wait about 3 min for build." >>> >>> --> how can I try? I would like to see the difference compared to the >>> current svnpubsub (functionality, speed,...) >>> Thx, Eric >> >> >> Hello Eric, >> >> Just go to the page you wish to edit (for example try: >> http://james.staging.apache.org/config-users.html) and click on the >> bookmarklet (see https://cms.apache.org/#bookmark on how to install = >> just add it to your bookmarsk) and you are ready to edit + commit from >> browser. Changes will trigger build+staging. If happy with results => >> click publish. >> >> Apache CMS uses svnpubsub as infrastructure. It just adds the >> bookmarklet that enables you to change the content from web-browser >> and automated building of content. Like I've said: continuosu >> integration for web pages. >> >> If we where using the perl build scripts + templates, building would >> have been very fast. With maven we get the site up in about 3 min now. >> >> If you look at the page with the bookmarklet you will see the commands >> to clean/stage/publish the site. Publish rights can be restricted to >> just a few. For apache pages only Apache members have them, not all >> commiters. >> >> >>>> Migrate James web sites to Apache CMS >>>> ------------------------------------- >>>> >>>> Key: JAMES-1374 >>>> URL: https://issues.apache.org/jira/browse/JAMES-1374 >>>> Project: JAMES Server >>>> Issue Type: Task >>>> Reporter: Eric Charles >>>> Assignee: Ioan Eugen Stan >>>> Original Estimate: 0h >>>> Remaining Estimate: 0h >>>> >>>> This is an umbrella JIRA to achieve the migration of Apache James web >>>> sites to the Apache CMS as requested by Infra. >>> >>> >>> -- >>> This message is automatically generated by JIRA. >>> If you think it was sent incorrectly, please contact your JIRA >>> administrators: >>> https://issues.apache.org/jira/secure/ContactAdministrators!default.jspa >>> For more information on JIRA, see: http://www.atlassian.com/software/jira >>> >>> >> >> >> > > -- > eric | http://about.echarles.net | @echarles > > > --------------------------------------------------------------------- > To unsubscribe, e-mail: [email protected] > For additional commands, e-mail: [email protected] > -- Ioan Eugen Stan http://ieugen.blogspot.com/ *** http://bucharest-jug.github.com/ *** --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
