On Tue, Aug 7, 2012 at 9:39 AM, Michal Hri� <[email protected]> wrote:
Can you wait with reveting that changes? I got stupid idea i ty it
when i
come home ... It takes 2 or 3 hours.
sent from //Odoslané z iPhonu, hrin
D�a 7.8.2012, o 18:13, Joe Schaefer <[email protected]> napísal:
> The problem here is that this directory was added
> and committed by someone but still existed as a local
> modification in the anon tree. I don't know how
> to resolve this without simply reverting the changes
> to the anon tree and losing all the edits so he'll
> have to start over.
>
>
>
>
>> ________________________________
>> From: Michal Hri� <[email protected]>
>> To: [email protected]
>> Sent: Tuesday, August 7, 2012 12:04 PM
>> Subject: Re: CMS diff: Why Apache OpenOffice: Great Software
>>
>> Hi ,
>>
>> This patch gives me errors, M+ on file and R_+_C on directories,
>> Kay, Joe or someone , can you look at this, is it my bug ?
>>
>> I can't find in hurry what this status means ...
>>
>> Regards, Michal Hri�
>>
>>
hmmmm...my local update of 2 mins ago shows the "/zh-cn/why/" changes
as
complete and OK, no odd "conflict" files appear. Of course, I'm not
trying
to do a commit on this area right now.
I will go ahead and apply the /zh-cn/index.html as requested.
Thanks Kay,
If it is OK for you, I think that can works.
My stupid idea seems will works too .. I got edited
"/zh-cn/why/why_great.mdtext" file
copied in my computer, so if will be some problems with this four
patches I 'll copy
changes in files to my computer and then I'll commit it
with procedure which works for me.
Michal Hriň
>>
>>
>>
>> Clone URL (Committers only):
>>
https://cms.apache.org/redirect?new=anonymous;action=diff;uri=http://ooo-
site.apache.org/zh-cn%2Fwhy%2Fwhy_great.mdtext
>>
>> Shenfeng Liu
>>
>> Index: trunk/content/zh-cn/why/why_great.mdtext
>> ===================================================================
>> --- trunk/content/zh-cn/why/why_great.mdtext (working copy)
>> +++ trunk/content/zh-cn/why/why_great.mdtext (working copy)
>> @@ -1,4 +1,4 @@
>> -Title: Why Apache OpenOffice: Great Software
>> +Title: 为何选择Apache OpenOffice：杰出的软件
>> Notice: Licensed to the Apache Software Foundation (ASF) under
one
>> or more contributor license agreements. See the NOTICE
file
>> distributed with this work for additional information
>> @@ -16,18 +16,18
@@
