Re: Advice for use of Subversion

"Clark, Ken" <Ken.Clark@pfizer.com> wrote on 04/20/2006 04:01:23 PM:

> 1) First, will Subversion allow us to merge code changes from a branch
to code
> changes on HEAD, even when the code is completely reorganized in HEAD

Not really. If the item has been moved in trunk when you merge the
changes from the branch it will not find the new location. You'd have to
use svn diff to create a patch and then apply it to the new location. At
least I can imagine that would work.

The main benefit you get from Subversion's move support is that the
history is maintained. The feature you need is on the wish-list. Some
preliminary work has been done but it will probably take a few more
releases before it is completely implemented.

> 2) If so, is there anything we need to pay particular attention to when
> reorganizing to ensure this works? It seems like we would not be able
to
> simply move a file and commit -- we must need to tell Subversion that
the new
> file used to be the old file.

SVN provides a full complement of subcommands like copy, move, delete that
you need to use.

> 3) Assuming that #2 requires careful submission of commands to
Subversion
> while moving files -- does Eclipse/Subclipse, IntelliJ 5.x, or some
other tool
> do a better job of managing this?

I can speak for Subclipse. It will capture a copy/move/refactoring
operation and run the command for you.

> 4) Is there a way to convert a CVS repository, history and all, into a
> Subversion repository. Does anyone have experience in particular doing
this
> for a SourceForge Enterprise Edition CVS/SVN installation (SFEE has some

> internal data to link CM commits to objects within SFEE)

There is the cvs2svn project which does an excellent job converting
repositories.

http://cvs2svn.tigris.org/

Mark

_____________________________________________________________________________
Scanned for SoftLanding Systems, Inc. and SoftLanding Europe Plc by IBM Email Security Management Services powered by MessageLabs.
_____________________________________________________________________________

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Thu Apr 20 22:11:50 2006