Frank Schönheit - Sun Microsystems Germany wrote: > Hi Heiner, > >> 'svn merge -x -b' is your friend ... > > You mean ... I really should go reading this Handbuch? :) > >> Could be done, and the earlier the better I guess. > > As long as we still have CVS-based CWS'es, which need to be migrated ... > not sure. Finally, migration will probably usually happen by "create a > CWS in SVN, based on the latest milestone, and *patch* in the changes of > the CVS-CWS". In this case, "svn merge" is of no help. Instead, it would > require people to create the SVN-CVS on an > pre-tab-replaced-by-spaces-milestone, then apply the patches, then lift > the SVN-CWS to a post-tab-replaced-by-spaces-milestone. Not a good > workflow, IMO. So, if we really want to do this replacement, I would do > this only when we can really rely on the power of "svn merge" being > available in all cases.
The trick would be to migrate CVS stuff to a SVN based branch @m32 and then rebase with svn merge to something newer ... => problem solved. Heiner -- Jens-Heiner Rechtien [EMAIL PROTECTED] --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
