File movement operations...

I have a repository that I converted from CVS:

cvs export X
svn co Y
copy X into Y
svn add *
svn commit

I now need to re-organize a number of files into new folders, etc. However, it is a working repository that several developers use, and there are a lot of projects within it. There is also a nightly build.

Eventually I will be moving each project into its own project space in the repository; but before I can do that, I need to move the commonly shared code into its own project. I'd like to try to do it with as little breakage as possible when I check things back-in.

I've been using subversion for several years, and am aware that SVN is quite smart in many ways. However, is it smart enough for what I want to do (below)?

I'm considering two approaches:

1) Move files around within the current revision, modify the projects to build using the new file locations, and then check-in.
2) Branch, do the #1 on the branch instead, then merge everything back.

I would normally do major changes on a branch (#2), but am concerned as I don't want to lose any updates to existing files - i.e. if I move a file, and then do 'svn update', will it carry updates to the file to the new file location? (I think it will, but want to make sure.) And will another developer's workspace carry their working changes over (if they have any)? Is the merging smart enough to carry over changes when merging trunk back into the branch (updating the branch) before merging the branch back to trunk (to close out the branch)?

Advice greatly appreciated!

Thanks,

Ben

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: users-help_at_subversion.tigris.org
Received on 2008-09-22 17:04:50 CEST