incubator-ooo-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Kay Schenk <kay.sch...@gmail.com>
Subject Re: CMS diff: Apache OpenOffice - 开放免费的文字处理软件
Date Thu, 09 Aug 2012 19:31:43 GMT
On Thu, Aug 9, 2012 at 11:23 AM, Joe Schaefer <joe_schaefer@yahoo.com>wrote:

> I believe the situation goes like this:
>
> Shenfeng creates that directory as a copy
> of some other directory as the CMS anon user
> and someone committed that change.  Then
> instead of updating the anon user tree and dealing
> with the directory conflict by reverting the directory
> add and pulling it from the server, he simply went
> ahead and edited the files in the directory, which
> were now sitting in a directory with a conflict marker
> on it.  That's why clones of the anon user's working copy
> fail to be able to commit from.
>
> The only way to fix this is to revert the directory
> as the anon user, and redo the changes.  Otherwise
> you will need to apply the patches sent to the mailing
> list to a local checkout of that directory and commit
> them.
>
> Because of the way the CMS deals with anonymous working
> copies, and the way svn deals with newly committed directories,
> you will always run into problems applying directory additions
> from an anonymous clone.  I will probably need to document
> the steps required on the cmsref page because the anon user
> needs to revert those changes before continuing on and editing
> the directory's contents.
>
>
>
Ok, just so we're clear on this.

It sort of sounds like requests for new directories shouldn't be made
through the CMS at all, but explicity requested *first*, and added by a
commtter through client svn. Yes?



>
> >________________________________
> > From: Kay Schenk <kay.schenk@gmail.com>
> >To: ooo-dev@incubator.apache.org
> >Sent: Thursday, August 9, 2012 2:08 PM
> >Subject: Re: CMS diff: Apache OpenOffice - ѵִ
> >
> >Hi Joe, Michal and Shenfeng--
> >
> >On 08/09/2012 11:03 AM, Joe Schaefer wrote:
> >> 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").
> >
> >After Michal said the other day (Tues) that he couldn't do a commit on
> >the recent changes Shenfeng made to the "why" area, I tried this also
> >(from the CMS bookmarklet) with the same results -- conflicts needed to
> >be resolved. So no commit, no publish.
> >
> >The next day (Wed) I did an update to my local repository with my local
> >client -- the supposed changes which could NOT be committed all showed
> >up OK in my local repository as added. Thus, I assumed they HAD been
> >committed, but I didn't follow up with a publish. I had NO idea when or
> >how they had been committed given my experience from the previous day.
> >
> >>
> >> 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
> >
> >OK, right I did an update but again this was to MY local repository and
> >not the "local" repository used by the CMS gui, or something -- well
> >they should be the same but something doesn't seem to be jiving.
> >
> >Anyway, I'm happy this worked out -- still a mystery.
> >
> >>
> >> 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
> >>>
> >>> Da 9.8.2012, o 19:39, Joe Schaefer <joe_schaefer@yahoo.com> napsal:
> >>>
> >>>> 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
> >>>>>
> >>>>> Da 9.8.2012, o 7:00, Shenfeng Liu <liushenf@gmail.com> napsal:
> >>>>>
> >>>>>> 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
> >>>>>>>
> >>>>>
> >>>>>
> >>>
> >>>
> >>>
> >
> >--
> >------------------------------------------------------------------------
> >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