Apache OpenOffice (AOO) Bugzilla – Issue 76821
cwsresync after site upgrade
Last modified: 2007-05-11 12:20:36 UTC
aquavcl01: paveljanik:/tmp/resync pavel$ cwsresync -m SRC680:m211 all cwsresync -- version: 1.29 cwsresync: Check out module 'fpicker' ... cwsresync: Retrieving changes ... ERROR: CvsModule::changed_files(): unexpected output from rdiff at /Users/pavel/.ooo/ ooo_SRC680_m211_src/solenv/bin/cwsresync.pl line 1679 at /Users/pavel/.ooo/ooo_SRC680_m211_src/solenv/bin/cwsresync.pl line 1688 main::get_changed_files('CvsModule=HASH(0x1a08df8)', 'CWS_SRC680_AQUAVCL01_ANCHOR', 'SRC680_m211') called at /Users/pavel/.ooo/ooo_SRC680_m211_src/solenv/bin/cwsresync.pl line 480 main::resync_module_action('Cws=HASH(0x194315c)', '/private/tmp/resync', 'SRC680:m211', 'fpicker') called at /Users/pavel/.ooo/ooo_SRC680_m211_src/solenv/bin/cwsresync.pl line 427 main::walk_action_list('Cws=HASH(0x194315c)', '/private/tmp/resync', 'SRC680:m211', 'ARRAY (0x198f784)', 'ARRAY(0x19e3174)', 'ARRAY(0x5bd724)', 'ARRAY(0x19e9350)', 'ARRAY(0x19eeaa0)', 'ARRAY(0x19e3108)', ...) called at /Users/pavel/.ooo/ooo_SRC680_m211_src/solenv/bin/cwsresync.pl line 134 paveljanik:/tmp/resync pavel$
Hi Ruediger, please have a look at this issue. "unexpected output from rdiff" is something that should not occur. Thanks
FYI: I already noticed that yesterday, I'm working on it.
There are several slight changes in the output of 'cvs rdiff' which cause parsing in CvsModule.pm to fail: - "cvs server: Diffing <directory name>" changed into "cvs rdiff: Diffing <directory name>" that line is used to track whether there was any diff action at all - "<file> is new; current revision <revision>" changed into "<file> is new; <branch> revision <revision>" - "<file> is removed; not included in release tag" chamged into "<file> is removed; <branch> revision <old revision>" Hopefully that's all, no more changes. I'm adapting CvsModule.pm to the new format.
Is this the solution for you? How will you resync cwses on other masters? This works for me, because I always use the latest cws tools, but...
Created attachment 44804 [details] Proposed patch for CvsModule.pm (not fully tested yet)
Attached patch for solenv/bin/modules/CvsModules.pm should fix this issue. Unfortunately I could not fully test it yet because of current problems with our internet connection (browsing via proxy works, but direct access to cvs tunnel does not).
cwsresync -m SRC680:m211 all worked OK, but -c: paveljanik:/tmp/resync pavel$ cwsresync -c all cwsresync -- version: 1.29 cwsresync: ========== Commit changes to 'fpicker': ========== Commit 'prj/l10n': delete: OK. Commit 'source/office/OfficeFilePicker.src': move tag: cwsresync: ERROR: Tagging 'source/office/ OfficeFilePicker.src': tag operation returned: 'unknownfailure'. failed!
I cannot move or delete branch tags any more. See issue i76897.
Created attachment 44832 [details] New, revised version of my patch.
Depends on issue 76897
Created attachment 44841 [details] Patch (hack?) for solenv/bin/cwsresync.pl
Pavel, Could you please check attached patch for cwsresync.pl? If it works for you, I'll submit that as quick fix for you and everyone else outside Sun Hamburg. We here unfortunately first have to update our (customized) CVS client. The new '-B' switch requires revision 1.11.2 or newer. We are using some stone aged version not supporting that switch.
Created attachment 44842 [details] Revised patch for cwsresync.pl ('-B' preceding other tag options)
Committed changes to cwsresync.pl, Cvs.pm, and CvsModule.pm for SRC680 (HEAD) and OOF680 (mws_oof680). Those changes should fix this issue, at least for everyone using a recent CVS client. Note: client has to be 1.11.2 or newer (check with 'cvs -v'). Note 2: not yet fixed for Sun Hamburg internal environment, as our custom cvs client is too old. Will be handled in a follow-up issue.
Internal follow-up task: issue 146900
Close issue.