Mailing-List: contact ooo-dev-help@incubator.apache.org; run by ezmlm
Precedence: bulk
Reply-To: ooo-dev@incubator.apache.org
Received-SPF: pass (athena.apache.org: local policy)
DomainKey-Signature: a=rsa-sha1; q=dns; c=nofws;
  s=s1024; d=yahoo.com;
  h=X-YMail-OSG:Received:X-Mailer:References:Message-ID:Date:From:Reply-To:Subject:To:In-Reply-To:MIME-Version:Content-Type;
  b=4bGKyAIHOJZxCIPEH1TcOfxDMP8Pr+u/gxx7TaioZo2q15xq7kvCHFBKPkRZaX1RViHUCg6e7gc3rLYb31GtvIl7iA4qxONtV2HmLdih3lRBMCvSazaCXsuqGoW7HVHylYsj+P8remCnZxmu2BJTb0h7A54JvVKwy5JG8lDMNFo=;
References: <20120807153512.7C7CE4A886E@cms.zones.apache.org>
 <CAGj3215zSrbPYRYRZXmCWUif=4bs_JfG6KNH1Kcb=op65fbCKA@mail.gmail.com>
 <CANQgRaa0yuChmqC_CGn0M0bEvptMKzOUKXbqj1TATRW09Ry44A@mail.gmail.com>
 <CAGj32147VFZQHhoj_2esUiCOFprLVF2+xW15TD3Ei4YPVdSydw@mail.gmail.com>
 <CANQgRaZEYnpAe3DnyB6p+oqemYrAOcCKqj6ytv6DiuFw33MfFQ@mail.gmail.com>
 <CDB3BFB4-78B9-4184-9C2C-A15C0AE90A83@aol.com>
 <1344533959.52790.YahooMailNeo@web124701.mail.ne1.yahoo.com>
 <6E5374E8-46C1-464F-B0AC-C005C53E53F7@aol.com>
 <1344535399.36470.YahooMailNeo@web124704.mail.ne1.yahoo.com>
 <5023FCB9.4030502@gmail.com>
Message-ID: <1344536599.36587.YahooMailNeo@web124705.mail.ne1.yahoo.com>
Date: Thu, 9 Aug 2012 11:23:19 -0700 (PDT)
From: Joe Schaefer <joe_schaefer@yahoo.com>
Reply-To: Joe Schaefer <joe_schaefer@yahoo.com>
Subject: 
 =?utf-8?B?UmU6IENNUyBkaWZmOiBBcGFjaGUgT3Blbk9mZmljZSAtIOW8gOaUvuWFjQ==?=
 =?utf-8?B?6LS555qE5paH5a2X5aSE55CG6L2v5Lu2?=
To: "ooo-dev@incubator.apache.org" <ooo-dev@incubator.apache.org>
In-Reply-To: <5023FCB9.4030502@gmail.com>
MIME-Version: 1.0
Content-Type: multipart/alternative;
 boundary="578871877-1596003628-1344536599=:36587"

--578871877-1596003628-1344536599=:36587
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: quoted-printable

I believe the situation goes like this:=0A=0AShenfeng creates that director=
y as a copy=0Aof some other directory as the CMS anon user=0Aand someone co=
mmitted that change.=C2=A0 Then=0Ainstead of updating the anon user tree an=
d dealing=0Awith the directory conflict by reverting the directory=0Aadd an=
d pulling it from the server, he simply went=0Aahead and edited the files i=
n the directory, which=0Awere now sitting in a directory with a conflict ma=
rker=0Aon it.=C2=A0 That's why clones of the anon user's working copy=0Afai=
l to be able to commit from.=0A=0AThe only way to fix this is to revert the=
 directory=0Aas the anon user, and redo the changes.=C2=A0 Otherwise=0Ayou =
will need to apply the patches sent to the mailing=0Alist to a local checko=
ut of that directory and commit=0Athem.=0A=0ABecause of the way the CMS dea=
ls with anonymous working=0Acopies, and the way svn deals with newly commit=
ted directories,=0Ayou will always run into problems applying directory add=
itions=0Afrom an anonymous clone.=C2=A0 I will probably need to document=0A=
the steps required on the cmsref page because the anon user=0Aneeds to reve=
rt those changes before continuing on and editing=0Athe directory's content=
s.=0A=0A=0A=0A=0A>________________________________=0A> From: Kay Schenk <ka=
y.schenk@gmail.com>=0A>To: ooo-dev@incubator.apache.org =0A>Sent: Thursday,=
 August 9, 2012 2:08 PM=0A>Subject: Re: CMS diff: Apache OpenOffice - =E5=
=BC=80=E6=94=BE=E5=85=8D=E8=B4=B9=E7=9A=84=E6=96=87=E5=AD=97=E5=A4=84=E7=90=
=86=E8=BD=AF=E4=BB=B6=0A> =0A>Hi Joe, Michal and Shenfeng--=0A>=0A>On 08/09=
/2012 11:03 AM, Joe Schaefer wrote:=0A>> I just published the site without =
issue- there=0A>> must be a language barrier here we need to overcome.=0A>>=
=0A>> Technically there are 3 seperate steps involved in editing=0A>> a pag=
e:=0A>>=0A>> 1) submitting your changes to the cms=0A>>=0A>> 2) telling the=
 cms to commit your changes=0A>>=0A>> 3) publishing the site=0A>>=0A>> (1 a=
nd 3) are almost never a problem, but (2) might be=0A>> because of the=C2=
=A0 status of a file or directory in the working=0A>> copy being inconflict=
 with that of the server (somestatus=0A>> other than "M").=0A>=0A>After Mic=
hal said the other day (Tues) that he couldn't do a commit on =0A>the recen=
t changes Shenfeng made to the "why" area, I tried this also =0A>(from the =
CMS bookmarklet) with the same results -- conflicts needed to =0A>be resolv=
ed. So no commit, no publish.=0A>=0A>The next day (Wed) I did an update to =
my local repository with my local =0A>client -- the supposed changes which =
could NOT be committed all showed =0A>up OK in my local repository as added=
. Thus, I assumed they HAD been =0A>committed, but I didn't follow up with =
a publish. I had NO idea when or =0A>how they had been committed given my e=
xperience from the previous day.=0A>=0A>>=0A>> To fix (2) you need to Updat=
e and Revert that directory=0A>> which will bring in in sync with the serve=
r (and nuke=0A>> any changes you or an anon user may have made).=C2=A0 THEN=
=0A>=0A>OK, right I did an update but again this was to MY local repository=
 and =0A>not the "local" repository used by the CMS gui, or something -- we=
ll =0A>they should be the same but something doesn't seem to be jiving.=0A>=
=0A>Anyway, I'm happy this worked out -- still a mystery.=0A>=0A>>=0A>> it =
should be ok to make the changes (step 1), commit them=0A>> (step 2), and p=
ublish them (step 3).=0A>>=0A>>=0A>>=0A>>=0A>>> ___________________________=
_____=0A>>> From: Michal Hri=C5=88 <michalhrin@aol.com>=0A>>> To: "ooo-dev@=
incubator.apache.org" <ooo-dev@incubator.apache.org>=0A>>> Sent: Thursday, =
August 9, 2012 1:56 PM=0A>>> Subject: Re: CMS diff: Apache OpenOffice - =E5=
=BC=80=E6=94=BE=E5=85=8D=E8=B4=B9=E7=9A=84=E6=96=87=E5=AD=97=E5=A4=84=E7=90=
=86=E8=BD=AF=E4=BB=B6=0A>>>=0A>>> Thanks Joe,=0A>>>=0A>>> I don't understan=
d well.=0A>>>=0A>>> I work online in cms apache.=0A>>> When I tried to appl=
y Shenfeng's patch the directory and files=0A>>> in zh-cn/why gives me an e=
rror. M__+ on files R_+_C on directory. When I take working copy from my ac=
count=0A>>> I don't see changes in this directory or on files.=0A>>> When I=
 make changes to files it gives me M status but commit is succesful, but pu=
blication not.=0A>>>=0A>>> Michal Hri=C5=88=0A>>>=0A>>> Sent from iPhone=0A=
>>>=0A>>> D=C5=88a 9.8.2012, o 19:39, Joe Schaefer <joe_schaefer@yahoo.com>=
 nap=C3=ADsal:=0A>>>=0A>>>> That doesn't make much sense to me=C2=A0 Michal=
=0A>>>> given how publish is implemented.=C2=A0 Mind if=0A>>>> I try publis=
hing to see what's wrong?=0A>>>>=0A>>>>=0A>>>>=0A>>>>=0A>>>>> _____________=
___________________=0A>>>>> From: Michal Hri=C5=88 <michalhrin@aol.com>=0A>=
>>>> To: "ooo-dev@incubator.apache.org" <ooo-dev@incubator.apache.org>=0A>>=
>>> Sent: Thursday, August 9, 2012 1:37 PM=0A>>>>> Subject: Re: CMS diff: A=
pache OpenOffice - =E5=BC=80=E6=94=BE=E5=85=8D=E8=B4=B9=E7=9A=84=E6=96=87=
=E5=AD=97=E5=A4=84=E7=90=86=E8=BD=AF=E4=BB=B6=0A>>>>>=0A>>>>> Hi,=0A>>>>>=
=0A>>>>> Joe can you revert all change made=0A>>>>> on ooo-site in zh-cn/wh=
y directory ?=0A>>>>>=0A>>>>> Kay and I are able to commit but not publish =
site=0A>>>>> to production.=0A>>>>>=0A>>>>> Regards,=0A>>>>> Michal Hri=C5=
=88=0A>>>>> Odoslan=C3=A9 z / Sent from iPhonu=0A>>>>>=0A>>>>> D=C5=88a 9.8=
.2012, o 7:00, Shenfeng Liu <liushenf@gmail.com> nap=C3=ADsal:=0A>>>>>=0A>>=
>>>> Kay,=0A>>>>>>=C2=A0 =C2=A0  Thanks for you and Michal's help to commit=
 the changes!=0A>>>>>>=C2=A0 =C2=A0  I verified the page of http://www.open=
office.org/zh-cn/index.html was=0A>>>>>> updated successfully!=0A>>>>>>=0A>=
>>>>>=C2=A0 =C2=A0  While the following 2 pages that I translated are still=
 unchanged till=0A>>>>>> now:=0A>>>>>>=0A>>>>>>=0A>>>>>>=C2=A0 =C2=A0 =C2=
=A0 - http://www.openoffice.org/zh-cn/why/why_great.html=0A>>>>>>=C2=A0 =C2=
=A0 =C2=A0 - http://www.openoffice.org/zh-cn/why/why_easy.html=0A>>>>>>=0A>=
>>>>>=0A>>>>>>=C2=A0 =C2=A0  Could you please check if you can see my submi=
t of the 2 pages above and=0A>>>>>> help to commit?=0A>>>>>>=C2=A0 =C2=A0  =
Thanks!=0A>>>>>>=0A>>>>>> - Shenfeng=0A>>>>>>=0A>>>>>>=0A>>>>>> 2012/8/9 Ka=
y Schenk <kay.schenk@gmail.com>=0A>>>>>>=0A>>>>>>> On Tue, Aug 7, 2012 at 6=
:21 PM, Shenfeng Liu <liushenf@gmail.com> wrote:=0A>>>>>>>=0A>>>>>>>> Thank=
s very much, Kay!=0A>>>>>>>>=0A>>>>>>>=0A>>>>>>> You're welcome...I'm nto s=
ure what happened with some that both Michal and=0A>>>>>>> I tried to commi=
t and publish.=0A>>>>>>>=0A>>>>>>> Please review the requests you made from=
 the last day or so, and let us=0A>>>>>>> know if anything looks amiss.=0A>=
>>>>>>=0A>>>>>>> My local svn client (eclipse) and the CMS implementation a=
re not one in the=0A>>>>>>> same, so I can't say what the problem is at the=
 moment. It *appeared* from=0A>>>>>>> my local copy that the changes had be=
en committed correctly, but I didn't=0A>>>>>>> verify the actual "publicati=
on" to production -- the web server. So, this=0A>>>>>>> is what needs to be=
 verified by you.=0A>>>>>>>=0A>>>>>>>=0A>>>>>>>=0A>>>>>>>>=0A>>>>>>>>=0A>>>=
>>>>> 2012/8/8 Kay Schenk <kay.schenk@gmail.com>=0A>>>>>>>>=0A>>>>>>>>> Thi=
s one was is complete.=0A>>>>>>>>>=0A>>>>>>>>> On Tue, Aug 7, 2012 at 8:35 =
AM, Shenfeng Liu <anonymous@apache.org>=0A>>>>>>>> wrote:=0A>>>>>>>>>=0A>>>=
>>>>>>> Clone URL (Committers only):=0A>>>>>>>>>>=0A>>>>>>>>>>=0A>>>>>>>>>=
=0A>>>>>>>>=0A>>>>>>> https://cms.apache.org/redirect?new=3Danonymous;actio=
n=3Ddiff;uri=3Dhttp://ooo-site.apache.org/zh-cn%2Findex.html=0A>>>>>>>>>>=
=0A>>>>>>>>>> Shenfeng Liu=0A>>>>>>>>>>=0A>>>>>>>>>> Index: trunk/content/z=
h-cn/index.html=0A>>>>>>>>>> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=0A>>>>>>>>>> --- trunk/content/zh-cn/index.html=C2=A0 =C2=A0 =C2=A0 =
(revision 1370070)=0A>>>>>>>>>> +++ trunk/content/zh-cn/index.html=C2=A0 =
=C2=A0 =C2=A0 (working copy)=0A>>>>>>>>>> @@ -30,7 +30,7 @@=0A>>>>>>>>>>=C2=
=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 <li>=0A>>>>>>>>>>=C2=A0 =C2=A0 =C2=
=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 <div class=3D"action-info">=0A>>>>>>=
>>>>=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 <=
div class=3D"action-text action-link">=0A>>>>>>>>>> -=C2=A0 =C2=A0 =C2=A0 =
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 <h2><a name=3D"content" hr=
ef=3D"/why/">=E6=88=91=E6=83=B3=E4=BA=86=E8=A7=A3=0A>>>>>>>>>> OpenOffice</=
a></h2>=0A>>>>>>>>>> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=
=A0 =C2=A0 =C2=A0 <h2><a name=3D"content" href=3D"why/">=E6=88=91=E6=83=B3=
=E4=BA=86=E8=A7=A3=0A>>>>>>>>>> OpenOffice</a></h2>=0A>>>>>>>>>>=C2=A0 =C2=
=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 <=
p>=0A>>>>>>>>>>=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=
=A0 =C2=A0 =C2=A0 =C2=A0 <a href=3D"/why/">Apache OpenOffice =E6=98=AF=E4=
=BB=80=E4=B9=88=EF=BC=9F=E4=B8=BA=E4=BB=80=E4=B9=88=E8=A6=81=E7=94=A8=0A>>>=
>>>> Apache=0A>>>>>>>>>> OpenOffice =EF=BC=9F</a>=0A>>>>>>>>>>=C2=A0 =C2=A0=
 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 </p>=
=0A>>>>>>>>>>=0A>>>>>>>>>>=0A>>>>>>>>>=0A>>>>>>>>>=0A>>>>>>>>> --=0A>>>>>>>=
>>=0A>>>>>>>>>=0A>>>>>>>>=0A>>>>>>> ---------------------------------------=
-------------------------------------------------=0A>>>>>>>>> MzK=0A>>>>>>>=
>>=0A>>>>>>>>> "I'm just a normal jerk who happens to make music.=0A>>>>>>>=
>> As long as my brain and fingers work, I'm cool."=0A>>>>>>>>>=C2=A0 =C2=
=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =
=C2=A0 =C2=A0 =C2=A0 =C2=A0  -- Eddie Van Halen=0A>>>>>>>>>=0A>>>>>>>>=0A>>=
>>>>>=0A>>>>>>>=0A>>>>>>>=0A>>>>>>> --=0A>>>>>>>=0A>>>>>>> ----------------=
------------------------------------------------------------------------=0A=
>>>>>>> MzK=0A>>>>>>>=0A>>>>>>> "I'm just a normal jerk who happens to make=
 music.=0A>>>>>>> As long as my brain and fingers work, I'm cool."=0A>>>>>>=
>=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=
=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0  -- Eddie Van Halen=0A>>>>>>>=0A>>>>=
>=0A>>>>>=0A>>>=0A>>>=0A>>>=0A>=0A>-- =0A>---------------------------------=
---------------------------------------=0A>MzK=0A>=0A>"I'm just a normal je=
rk who happens to make music.=0A>=C2=A0 As long as my brain and fingers wor=
k, I'm cool."=0A>=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0  -- Eddie Van Halen=0A>=0A=
>=0A>
--578871877-1596003628-1344536599=:36587--