Naively thinking that Subversion with its svn move command would make
it easy to move files around in the OOo code base, I moved
connectivity/source/drivers/odbc/OPreparedStatement.cxx to connectiviy/
source/drivers/odbcbase/OPreparedStatement.cxx (note odbc vs.
odbcbase) on CWS sb102 (then based on DEV300m35) and then rebased the
CWS to DEV300m37. The result was that the CWS no longer compiled: A
change to connectivity/source/drivers/odbc/OPreparedStatement.cxx and
related files had been integrated into DEV300m37 (from CWS dba31e),
but the merge of DEV300m37 into sb102 had not reflected those changes
in sb102's connectivity/source/drivers/odbcbase/
OPreparedStatement.cxx---after all, svn move is nothing but a
combination of svn add and svn delete, so Subversion unfortunately
does not properly keep track of the relation between those two files
(it does keep track, but only "looking backward," not "looking
forward," so to speak).
So, back to good old manual merging: Remember which files you moved
in your CWS, and after every rebase, check whether they miss any
changes to the original files. Sigh.
However, what worries me deeply is the "[not] true data loss" scenario
upon svn merge --reintegrate described at <http://svnbook.red-bean.com/en/1.5/svn.branchmerge.advanced.html#svn.branchmerge.advanced.moves
>. A disaster waiting to happen, I would say. Or am I missing
something?
-Stephan
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
