Philipp Lohmann wrote:
Hi,
AFAIK the cws tool is not quite done yet. For rebasing one needs the m35
version already, try this
Unfortunately even m35 has (at least) one bug in 'cws rebase': issue 95921
Therefore you need (not yet existing) m36 or have to merge one more file:
$ cd solenv/bin
$ svn merge
svn+ssh://[EMAIL PROTECTED]/ooo/trunk/solenv/bin/cws.pl
$ cd modules
$ svn merge svn+ssh://[EMAIL PROTECTED]/ooo/trunk/solenv/bin/modules/CwsConfig.pm
$ svn merge
svn+ssh://[EMAIL PROTECTED]/ooo/trunk/solenv/bin/modules/Cws.pm
to update the cws command (you actually need both files). After that it
should be merge and commit like you stated.
Rüdiger
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
