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: Pakiet biurowy OpenOffice.org po polsku
Date Sat, 21 Jul 2012 20:34:32 GMT
Conflicts in the CMS happen when two people work
on the same lines in a file and commit their
changes without either one of them updating
their tree in between commits.  The update
process will try to download the latest changes
applied to the svn server and merge them into
your working copy- when it can't figure out
how to do that successfully by itself it complains
abouta conflict and expects the user to intervene
and "resolve" the conflict.  Once you've resolved
the conflicts you will be able to commit your changes
again.


Keep in mind that if a CMS commit fails, the CMS will
automatically update your tree and try again.  That's
what happened here, but when it updated your tree it
detected a conflict which blocked its attempt to commit.



Normally I just take the changes from the server
(accept-theirs) and then start re-editing whatever
changes of mine that got lost in the process.



----- Original Message -----
> From: Kay Schenk <kay.schenk@gmail.com>
> To: ooo-dev@incubator.apache.org
> Cc: 
> Sent: Saturday, July 21, 2012 4:26 PM
> Subject: Re: CMS diff: Pakiet biurowy OpenOffice.org po polsku
> 
> On Sat, Jul 21, 2012 at 10:32 AM, Dave Fisher <dave2wave@comcast.net> 
> wrote:
> 
>>  Good news, I look forward to seeing these results.
>> 
>>  On Jul 21, 2012, at 9:32 AM, Joe Schaefer wrote:
>> 
>>  > You did the right thing in resolving the conflict.
>>  > I looked at your working copy and other than there
>>  > being 2 <title> sections for the page it looks ready
>>  > to commit.
>> 
> 
> Yeah, well, my svn "local" copy didn't share your enthusiam. Oy!
> 
> OK, after unscrambling snv's brains, it's all good now!
> 
> Thanks for the encouraging words by the way. I think Rob and I got into
> some kind of "lock" situation which I hadn't experienced before.
> 
>> 
>>  >
>>  >
>>  > ----- Original Message -----
>>  >> From: Kay Schenk <kay.schenk@gmail.com>
>>  >> To: ooo-dev@incubator.apache.org
>>  >> Cc:
>>  >> Sent: Saturday, July 21, 2012 12:24 PM
>>  >> Subject: Re: CMS diff: Pakiet biurowy OpenOffice.org po polsku
>>  >>
>>  >> On Fri, Jul 20, 2012 at 3:11 PM, Dave Fisher 
> <dave2wave@comcast.net>
>>  >> wrote:
>>  >>
>>  >>> Oops, I had got into anonymous mode.
>>  >>>
>>  >>
>>  >> Well OK...I am STILL trying to fix this and running into 
> "conflict"
>>  >> problems -- huh, wah!? :(
>>  >>
>>  >> Later...things to do for a few hours.
>>  >>
>>  >>
>>  >>
>>  >>>
>>  >>> On Jul 20, 2012, at 3:08 PM, There were three lines of 
> mismatched tags
>>  >>> wrote:
>>  >>>
>>  >>>> Clone URL (Committers only):
>>  >>>>
>>  >>>
>>  >>
>> 
> https://cms.apache.org/redirect?new=anonymous;action=diff;uri=http://ooo-site.apache.org/pl%2Findex.html
>>  >>>>
>>  >>>> There were three lines of mismatched tags
>>  >>>>
>>  >>>> Index: trunk/content/pl/index.html
>>  >>>> 
> ===================================================================
>>  >>>> --- trunk/content/pl/index.html       (revision 1363590)
>>  >>>> +++ trunk/content/pl/index.html       (working copy)
>>  >>>> @@ -42,8 +42,6 @@
>>  >>>> </head>
>>  >>>> <body>
>>  >>>>
>>  >>>> -</div>
>>  >>>> -</td></tr></table>
>>  >>>> <table id="mainpl"><tr>
>>  >>>> <td id="menu">
>>  >>>>    <a href="http://pl.openoffice.org"
>>  >> id="stronaglowna"></a>
>>  >>>>
>>  >>>
>>  >>>
>>  >>
>>  >>
>>  >> --
>>  >>
>> 
> ----------------------------------------------------------------------------------------
>>  >> MzK
>>  >>
>>  >> "I would rather have a donkey that takes me there
>>  >> than a horse that will not fare."
>>  >>                                           -- Portuguese
proverb
>>  >>
>> 
>> 
> 
> 
> -- 
> ----------------------------------------------------------------------------------------
> MzK
> 
> "I would rather have a donkey that takes me there
> than a horse that will not fare."
>                                           -- Portuguese proverb
> 

Mime
View raw message