On Mon, Sep 30, 2013 at 2:46 PM, Rob Weir <robw...@apache.org> wrote:
> On Mon, Sep 30, 2013 at 5:21 PM, Kay Schenk <kay.sch...@gmail.com> wrote: > > On Mon, Sep 30, 2013 at 12:36 PM, Andrea Pescetti <pesce...@apache.org > >wrote: > > > >> Marcus (OOo) wrote: > >> > >>> OK, just go and publish. I've finished the needed changes. Let's see if > >>> something is still wrong. > >>> > >> > >> While still waiting for the build fix, I've now updated the Italian, > >> Lithuanian and Swedish pages. > >> > >> Regards, > >> Andrea. > >> > >> > >> > ------------------------------**------------------------------**--------- > >> To unsubscribe, e-mail: dev-unsubscribe@openoffice.**apache.org< > dev-unsubscr...@openoffice.apache.org> > >> For additional commands, e-mail: dev-h...@openoffice.apache.org > >> > >> > > Can someone give us an update on this? > > > > Is there something we can do? Like force new ooo-site working copy? I'm > on > > infra TRC right now, but I don't see anything pertaining to this... > > > > I tried that via: > https://cms.apache.org/redirect?new=1;uri=http://ooo-site.apache.org/ > > But I ended up with the same error after the next build attempt. > You're welcome to try your luck. Maybe I missed something. > > I think something got out of order in the commits to staging. > > Before this problem happened we had: > > /content/pt (the old Portuguese directory) > /content/pt-test (the new translation) > > I moved pt to pt.old and then moved pt-test to pt. I committed that > from my local working copy to SVN. No errors. I then made one > further change to /pt/brand.mdtext. That would be the new /pt > directory, of course. No error committing that change. > OK, you did an *svn* move of pt to pt.old? I think this is what is causing the hangup. The (CMS) svn now thinks "pt" should (have been) be deleted -- maybe your svn version operates slightly differently than whatever the CMS is using, isn't. Can you try doing an svn remove on pt again, followed by a commit? Then maybe continue with the rest -- moving pt-test to pt? Or, maybe do "svn cleanup" and then the removal of "pt"? You might need to recreate the whole "pt" area again, but, oh well... > But now we have an error: > > Unmergeable scheduling requested on an entry: Can't add > '/usr/local/websites/ooo-site/trunk/content/pt/brand.html' to a parent > directory scheduled for deletion at > /usr/local/cms/build/lib/ASF/SVNUtil.pm line 69 > > That sounds like it noticed the deletion of the old pt directory when > it was renamed to pt.old, but does not notice that a new pt directory > was created when pt-test was renamed to pt. > > Or something else. > > > -Rob > > > > > > -- > > > ------------------------------------------------------------------------------------------------- > > MzK > > > > "Truth is stranger than fiction, but it is because Fiction is obliged > > to stick to possibilities. Truth isn't." > > -- "Following the Equator", Mark Twain > > --------------------------------------------------------------------- > To unsubscribe, e-mail: dev-unsubscr...@openoffice.apache.org > For additional commands, e-mail: dev-h...@openoffice.apache.org > > -- ------------------------------------------------------------------------------------------------- MzK "Truth is stranger than fiction, but it is because Fiction is obliged to stick to possibilities. Truth isn't." -- "Following the Equator", Mark Twain
