Hi,
AFAIK the cws tool is not quite done yet. For rebasing one needs the m35
version already, try this
$ 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
to update the cws command (you actually need both files). After that it
should be merge and commit like you stated.
best keep a backup copy of those two files, though, I don't know if
everything works as designed already.
Just my 2 cents, pl
Kohei Yoshida wrote:
Hi there,
I'm trying to rebase my svn-based CWS to m35, but I have hard time
understanding the right steps to do it.
Since this page
http://wiki.services.openoffice.org/wiki/OOo_and_Subversion
does not have any instructions for cws rebase (it says [Tbd]), here is
what I've tried based on the help output of 'cws help rebase'.
1) cws rebase -m m35
2) resolved conflict.
3) cws rebase -C
But the last command only displays the help output and doesn't commit
the changes to the cws repository.
What's the correct way to rebase a svn-based cws?
TIA,
Kohei
--
Someone told me: "Smile and be happy, it could be worse"
And I smiled and was happy and things became worse.
-- Author unknown
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
