[cvsnt] Moving files to different directories

[Harrison, Andrew]

Hi,

I've not been subscribing to these lists for some time, so sorry if this
has already been covered. I've looked at the list archives and the wiki
and haven't found the details I'm looking for.

We are about to do a bit of restructuring to our project which will
include creating a new directory structure and moving files from the old
structure to the new structure. Most files will retain the same file
names, but it is possible that a few file names may also need to change.

I know I can do this simply by creating a new directory, copy the file
from the old to the new, add the new file, remove the old file, delete
the old directory, and finally commit the whole lot.

However, since this is still an active development, we want to be able
to do it with minimal impact on users.

Scenario:
Current file - OldDir/MyFile.c
Take a branch, move OldDir/MyFile.c to NewDir/MyFile.c
OldDir/MyFile.c independently changed on trunk.
Merge trunk into branch, changes are merged into NewDir/MyFile.c
Merge branch into trunk, OldDir/MyFile.c is moved to NewDir/MyFile.c
User with existing branch with modified OldDir/MyFile.c merges from
trunk, OldDir/MyFile.c is moved to NewDir/MyFile.c and merges applied.

Using the delete/add method would mean that these merges would have to
be done manually. 

And so to my question - will cvs rename handle this, or does it only
handle renaming of files within a directory. And is it still considered
"experimental"?

Client: Concurrent Versions System (CVSNT) 2.0.41a (client/server)
Server: Concurrent Versions System (CVSNT) 2.0.58d (client/server)

As you can see from my cvs version, I'm not exactly up-to-date with the
server version. Is there significant differences in rename in 2.5.x, and
is it worth using/waiting for 2.6.x instead?

Rgds,
Andy

--
Andy Harrison - Platform Software Engineer 
Anite Telecoms Ltd. Ancells Business Park, Fleet, Hampshire, GU51 2UZ,
UK [http://www.anite.com/telecoms]
"No matter how bad things seem... nothing could be worse than being used
as a towel rail." - A.A. Milne




Scanned for viruses by BlackSpider MailControl. The integrity and security of this message cannot be guaranteed. This email is intended for the named recipient only, and may contain confidential information and proprietary material. Any unauthorised use or disclosure is prohibited.