info-cvs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: Newbie: problems adding directory to repository


From: Kaz Kylheku
Subject: Re: Newbie: problems adding directory to repository
Date: 15 Aug 2003 04:56:52 -0700

Jesse Sheidlower <address@hidden> wrote in message news:<address@hidden>...
> There was a point at which I was making a lot of changes to my
> dev sandbox, but didn't have access to the repository so
> couldn't commit anything. When I got back to it, I found that
> I couldn't get some things to match up.
> 
> The basic problem is that I had taken a specific program, and
> directory, called Book.pm and Book/ and then generalized it
> and renamed them to MyDatabase.pm and MyDatabase/ . In my dev

CVS doesn't support renaming and moving. You want to be a Meta-CVS
user!

(Meta-CVS even has some support for detecting moves and renames that
were done behind its back, so to speak, rather than using the ``mcvs
mv'' command. The ``mcvs remap'' command will scan the directory tree,
and based on the software's knowledge of the inode numbers of your
files, it will uncover the moves. There are some limitations; if you
move by copying, the inode identity is lost, and remap doesn't find
moved symlinks. It's better to use the proper commands to rearrange
the directory structure!)

In Meta-CVS, directory structure rearrangements are just, effectively,
like any other local edit. They can be done locally without being
connected to the repository, and then committed when you regain
access---and subject to merging and conflict resolution.

In plain CVS, renaming is simulated by deleting files and adding them
under new names. This must be done using the CVS commands ``rm'' and
``add''; CVS will not guess your intent from any direct filesystem
rearrangements you have done.


reply via email to

[Prev in Thread] Current Thread [Next in Thread]