incubator-ooo-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Joe Schaefer <joe_schae...@yahoo.com>
Subject Re: CMS diff: Apache OpenOffice - 开放免费的文字处理软件
Date Thu, 09 Aug 2012 18:03:19 GMT
I just published the site without issue- there
must be a language barrier here we need to overcome.

Technically there are 3 seperate steps involved in editing
a page:

1) submitting your changes to the cms

2) telling the cms to commit your changes

3) publishing the site

(1 and 3) are almost never a problem, but (2) might be
because of the  status of a file or directory in the working
copy being inconflict with that of the server (somestatus
other than "M").

To fix (2) you need to Update and Revert that directory
which will bring in in sync with the server (and nuke
any changes you or an anon user may have made).  THEN 

it should be ok to make the changes (step 1), commit them
(step 2), and publish them (step 3).




>________________________________
> From: Michal Hriň <michalhrin@aol.com>
>To: "ooo-dev@incubator.apache.org" <ooo-dev@incubator.apache.org> 
>Sent: Thursday, August 9, 2012 1:56 PM
>Subject: Re: CMS diff: Apache OpenOffice - 开放免费的文字处理软件
> 
>Thanks Joe,
>
>I don't understand well.
>
>I work online in cms apache.
>When I tried to apply Shenfeng's patch the directory and files
>in zh-cn/why gives me an error. M__+ on files R_+_C on directory. When I take working
copy from my account
>I don't see changes in this directory or on files.
>When I make changes to files it gives me M status but commit is succesful, but publication
not.
>
>Michal Hriň
>
>Sent from iPhone
>
>Dňa 9.8.2012, o 19:39, Joe Schaefer <joe_schaefer@yahoo.com> napísal:
>
>> That doesn't make much sense to me  Michal
>> given how publish is implemented.  Mind if
>> I try publishing to see what's wrong?
>> 
>> 
>> 
>> 
>>> ________________________________
>>> From: Michal Hriň <michalhrin@aol.com>
>>> To: "ooo-dev@incubator.apache.org" <ooo-dev@incubator.apache.org> 
>>> Sent: Thursday, August 9, 2012 1:37 PM
>>> Subject: Re: CMS diff: Apache OpenOffice - 开放免费的文字处理软件
>>> 
>>> Hi,
>>> 
>>> Joe can you revert all change made
>>> on ooo-site in zh-cn/why directory ?
>>> 
>>> Kay and I are able to commit but not publish site
>>> to production.
>>> 
>>> Regards,
>>> Michal Hriň
>>> Odoslané z / Sent from iPhonu
>>> 
>>> Dňa 9.8.2012, o 7:00, Shenfeng Liu <liushenf@gmail.com> napísal:
>>> 
>>>> Kay,
>>>>   Thanks for you and Michal's help to commit the changes!
>>>>   I verified the page of http://www.openoffice.org/zh-cn/index.html was
>>>> updated successfully!
>>>> 
>>>>   While the following 2 pages that I translated are still unchanged till
>>>> now:
>>>> 
>>>> 
>>>>    - http://www.openoffice.org/zh-cn/why/why_great.html
>>>>    - http://www.openoffice.org/zh-cn/why/why_easy.html
>>>> 
>>>> 
>>>>   Could you please check if you can see my submit of the 2 pages above and
>>>> help to commit?
>>>>   Thanks!
>>>> 
>>>> - Shenfeng
>>>> 
>>>> 
>>>> 2012/8/9 Kay Schenk <kay.schenk@gmail.com>
>>>> 
>>>>> On Tue, Aug 7, 2012 at 6:21 PM, Shenfeng Liu <liushenf@gmail.com>
wrote:
>>>>> 
>>>>>> Thanks very much, Kay!
>>>>>> 
>>>>> 
>>>>> You're welcome...I'm nto sure what happened with some that both Michal
and
>>>>> I tried to commit and publish.
>>>>> 
>>>>> Please review the requests you made from the last day or so, and let
us
>>>>> know if anything looks amiss.
>>>>> 
>>>>> My local svn client (eclipse) and the CMS implementation are not one
in the
>>>>> same, so I can't say what the problem is at the moment. It *appeared*
from
>>>>> my local copy that the changes had been committed correctly, but I didn't
>>>>> verify the actual "publication" to production -- the web server. So,
this
>>>>> is what needs to be verified by you.
>>>>> 
>>>>> 
>>>>> 
>>>>>> 
>>>>>> 
>>>>>> 2012/8/8 Kay Schenk <kay.schenk@gmail.com>
>>>>>> 
>>>>>>> This one was is complete.
>>>>>>> 
>>>>>>> On Tue, Aug 7, 2012 at 8:35 AM, Shenfeng Liu <anonymous@apache.org>
>>>>>> wrote:
>>>>>>> 
>>>>>>>> Clone URL (Committers only):
>>>>>>>> 
>>>>>>>> 
>>>>>>> 
>>>>>> 
>>>>> https://cms.apache.org/redirect?new=anonymous;action=diff;uri=http://ooo-site.apache.org/zh-cn%2Findex.html
>>>>>>>> 
>>>>>>>> Shenfeng Liu
>>>>>>>> 
>>>>>>>> Index: trunk/content/zh-cn/index.html
>>>>>>>> ===================================================================
>>>>>>>> --- trunk/content/zh-cn/index.html      (revision 1370070)
>>>>>>>> +++ trunk/content/zh-cn/index.html      (working copy)
>>>>>>>> @@ -30,7 +30,7 @@
>>>>>>>>          <li>
>>>>>>>>              <div class="action-info">
>>>>>>>>                  <div class="action-text action-link">
>>>>>>>> -                    <h2><a name="content"
href="/why/">我想了解
>>>>>>>> OpenOffice</a></h2>
>>>>>>>> +                    <h2><a name="content"
href="why/">我想了解
>>>>>>>> OpenOffice</a></h2>
>>>>>>>>                      <p>
>>>>>>>>                      <a href="/why/">Apache
OpenOffice 是什么?为什么要用
>>>>> Apache
>>>>>>>> OpenOffice ?</a>
>>>>>>>>                      </p>
>>>>>>>> 
>>>>>>>> 
>>>>>>> 
>>>>>>> 
>>>>>>> --
>>>>>>> 
>>>>>>> 
>>>>>> 
>>>>> ----------------------------------------------------------------------------------------
>>>>>>> MzK
>>>>>>> 
>>>>>>> "I'm just a normal jerk who happens to make music.
>>>>>>> As long as my brain and fingers work, I'm cool."
>>>>>>>                               -- Eddie Van Halen
>>>>>>> 
>>>>>> 
>>>>> 
>>>>> 
>>>>> 
>>>>> --
>>>>> 
>>>>> ----------------------------------------------------------------------------------------
>>>>> MzK
>>>>> 
>>>>> "I'm just a normal jerk who happens to make music.
>>>>> As long as my brain and fingers work, I'm cool."
>>>>>                               -- Eddie Van Halen
>>>>> 
>>> 
>>> 
>
>
>
Mime
  • Unnamed multipart/alternative (inline, None, 0 bytes)
View raw message