Apache OpenOffice (AOO) Bugzilla – Issue 61202
Cannot resync from m137 to m152 with macosxfondu
Last modified: 2006-03-13 12:36:12 UTC
Mac OS X / try to resync from m137 to m152 cws concerned : macosxfondu cwsanalyze .... cwsresync -c all ok ... etc (just one conflict inn postprocess, I have half-solved, the time to resync) Now, trying -> cwsresync -l m152 Updating 'x11_extensions' with SRC680_m152' ... Updating 'xalan' with SRC680_m152' ... Updating 'xmerge' with SRC680_m152' ... ERROR: CvsModule::do_update(): CVS client returned error code '1'! The last 5 CVS messages leading up to the problem were: cvs update: Updating source/xmerge/java/org/openoffice/xmerge/test cvs update: Updating source/xmerge/java/org/openoffice/xmerge/util cvs update: Updating source/xmerge/java/org/openoffice/xmerge/util/registry cvs update: Updating util cvs update: Updating workben at /Volumes/extension1/OpenOffice.org/solenv/bin/cwsresync.pl line 820 FYI : I already have rm -rf xmerge and checked *fresh* m152 xmerge. This is my *second complete try*, and I'm trying since 10:00 (it's now 18:50 ) with that. Were am I wrong ? Thank's in advance for any help Note : I already have succssfully resync'ed some cws, it's not my first try.
Same issue when trying to resync macintel01 (more recent than macosxfondu) No conflict : cwsanalyse -all .... All Modules: 10 clean merge(s), 11 new, 0 removed, 0 conflict(s), 0 alert(s) cwsresync -m 153 all no problem .... cwsresync -l m153 (some times ) ... Updating 'xalan' with SRC680_m153' ... Updating 'xmerge' with SRC680_m153' ... ERROR: CvsModule::do_update(): CVS client returned error code '1'! The last 5 CVS messages leading up to the problem were: cvs server: Updating source/xmerge/java/org/openoffice/xmerge/test cvs server: Updating source/xmerge/java/org/openoffice/xmerge/util cvs server: Updating source/xmerge/java/org/openoffice/xmerge/util/registry cvs server: Updating util cvs server: Updating workben at /Volumes/extension1/OpenOffice.org/solenv/bin/cwsresync.pl line 820 Is it my configuration ? I can commit, create cws , addtask, ... without problem, but cwsresync -l is always problematic
Worked for me. hr: can it be a problem that Eric used anoncvs for the checkout of all modules?
@ericb: the error log does not indicate what to problem is. Can you update xmerge by hand? Please check the command error ($? in the shell) right after a manual checkout of xmerge. @pavel: I'm not sure what you mean? you can checkout fron anoncvs for sure but you couldn't commit something back without patching the CVS root files. The CWS tools have a build in support for checkout from a supposely fast r/o mirror with subsequent patching of root files and update from the "real" server. @eric: do you use such a setup?
ericb->hjr Well, in fact, I have tried two times : first with xmerge from m152, and second with xmerge checked doing : rm -rf xmerge cvs -z4 co -r SRC680_m152 xmerge I guess this is what you mean for "manually" ? If not, please correct me. FYI, my environment is created using : source MacosxEnv.Set.sh # (in $SRC_ROOT) export CWS_WORK_STAMP=macosxfondu export CVSROOT=":pserver:ericb@localhost:/cvs" + (in another xterm) tunnel is created using : ssh -2 -x -L 2401:localhost2401 tunnel@openoffice.org Whith that, cwscreate, cwsaddtask, cwsquery, cwsadd, commit ..everything without problem. Just cwsresync -l fails, probably because I have something wrong, but what ... ? If this can help, I remember have already resynced cws, like macosx20xfixes01 (or another cws, not sure), without any problem neither.
Eric, after the manual update of xmerge, what is the shell error code of the last command? Please do a: $ rm -rf xmerge $ cvs co -r SRC680_m152 xmerge $ echo $? if you use a bourne like shell
ericb->hr echo $? returns 0
@erib: hmm, I have no idea what's going wrong here. Does cwsresync -l always stop at the same place (xmerge) or does it vary
@hr The three times, " cwsresync -l " stops in xmerge, with exactly the same error. My sources are clean, just checked from either anoncvs (for the part not in cws to resync), or from tunnel for the cws concerned part.
@ericb: Fascinating ... I've got another error with a very similiar report today and in this case it was an unclean CVS tree which couldn't be updated. I just can't reproduce this behavior. Could you please try to check out xmerge from the tunnel? Maybe anon CVS is broken in a way.
@eric: can you still not resync? If not, please use cwsresync -f -l, it prevents updating the source tree. Do update the source tree by hand then.
ericb->hr "cwsresync -f -l " has worked as excpected. thank you :-) I just resynced macosxfondu with m158 five minutes ago. Shall I close this issue ? I think wontfix can match with this issue type, or ... ?
resolve to wontfix. ericb: please close if everything is OK with your resynced CWS:
Closing issue.