Re: Resync problems
Jens-Heiner Rechtien <[email protected]>
| Newsgroups | gmane.comp.openoffice.devel.porting |
|---|---|
| Organization | Sun Mircosystems, Inc. |
| Message-ID | <[email protected]> |
Hi Eric, 'cvs rdiff' used to be broken on collab CVS server (haven't checked it lately but I think it's still the case). The CWS tooling including 'cwsresync' depends on it. Luckily there is a workaround: use '/shared/data/helm/cvs/repository' instead of '/cvs' as part of your CVSROOT when using 'cvs rdiff'. This is what the message from cwsresync is all about. You need a second entry in your '.cvspass' with with just '/cvs' after the last colon replaced with '/shared/data/helm/cvs/repository'. Depending on your exact setup the server name may vary (ie. localhost for a tunnel). My suggestion: edit '.cvspass', copy the line to the OOo server and replace the last part of the copied line as mentioned. Heiner eric.bachard wrote: > Hi Rüdiger, > > Rüdiger Timm a écrit : > >>> This fix is in macxjoin1153 cws, but I cannot resync with recent >>> milestone, and I don't know why, sorry. > > >> In which step of the resync process do you have problems, > > > when I try to do "cwsanalyse all" > > and what does > >> not work? What is the error message? > > > Something close to : > > """""""""""""""""""""""""""""""" quote > """""""""""""""""""""""""""""""""""""" > > ========== Analyzing module 'sw' ========== > Retrieving changes ... > > The cvs rdiff command is broken for the OOo CVS server. > To fix this problem you have to issue the following cvs login command: > > cvs -d :pserver:ericb@localhost:/shared/data/helm/cvs/repository login > > The password is your ususal OOo password. > > """"""""""""""""""""""""""""""""""" end quote > """"""""""""""""""""""""""""""""""""""""" > > But " cvs -d :pserver:ericb@localhost:/shared/data/helm/cvs/repository > login " does not work, because I have not > /shared/data/helm/cvs/repository directory locally... > > Another try using a bad password gives me an error, so we can be sure > that the login mecanismus works. > > To be more complete, I use tunnel with ssh + local cvs repository ( > using CVSROOT :pserver:[email protected] ) > I have tried with a checkout of m53 modules (the complete list of > macxjoin1153) for resync. Just following instructions I found in > tools.openoffice.org. > > > To make short, I can : > > - use cwsquery without problem : cwsquery -m SRC680 latest -> this > command gives me actually m124 > - create cws > - addtask > - commit > - add modules (only with cws I myself have created) > > But : > > - cwsanalyse does not work at all... (proceed in tmp dir, like written > in the doc ). > > Important : I already have resync'ed a cws (for SRC680), and it already > was a nightmare for me because of the conflict. > > > In fact everything excepted "cwsanalyse all" works. Is this possible > this tool does not work correctly with 1.1.x ? > I'm actually building m124 on Linux PPC, and I cannot perform any test > on Mac OS X before this evening. > > > Thank you for your time :-) > > > Regards, > eric bachard > -- Jens-Heiner Rechtien [email protected]