info-cvs
[Top][All Lists]

## Re: problem when trying to join branch to trunk

 From: Mark D. Baushke Subject: Re: problem when trying to join branch to trunk Date: Sun, 26 Nov 2000 21:52:08 -0800

Hi Efraim,

> Date: Sun, 26 Nov 2000 18:52:40 +0200
>
> I am running CVS on Win NT using a :local: repository.  We have been working
> on a branch of our CVS tree for about a month or two, and now want to rejoin
> it to the trunk.  (One of the reasons is that we have become aware of the
> fact that it is evidently impossible to get old versions of the branch by
> date using -D.)

Your assertion is true of the cvshome.org 'standard' version of CVS.

FYI. One of the enhancements that is available in the FreeBSD version
of CVS is the ability to use -D "date string" -rbranch_tag at the same
time.

You may checkout your own copy of the FreeBSD CVS sources using the
commands:

or just browse through the web via

http://www.FreeBSD.org/cgi/cvsweb.cgi/src/contrib/cvs/

to take a look at the sources. The current top of tree incorporates
all of the changes for cvs 1.11. However, I have never attempted to
build an NT executable for CVS that uses the FreeBSD source base.

> There are a number of files on the branch which do not
> exist on the trunk, and when I tried to commit a directory based on the
> trunk but updated to join with the branch with 'cvs up -j' I got an error
> for every new file:
>
> cvs commit: failed to move g:\cvsrepository/foo/bar/Attic/xxx.c,v' out of
> the attic: Permission denied

CVS is attempting to move the foo/bar/Attic/xxx.c,v file into
foo/bar/xxx.c,v for you and the above error message is indicating a
problem doing this rename. You could do the file rename manually if
you have to and then continue the operation.

> The directory where the repository is and all the files in it have global
> has never presented any other problems with CVS.

This is correct, the RCS format ,v files should be read-only files.
You don't mention what kind of filesystem you are using, but you may
find that doing a 'move' operation on an NT box may require read-write
permissions for the user for the duration of the move... I have not
played with an NT system in some time, so your mileage may vary.

If you manually have problems opening a DOS window and doing

g:
cd \cvsrepository\foo\bar
move Attic\xxx.c,v xxx.c,v

then you might try to change the permissions on the file to have
the owner have read-write access and see if that fixes your problem.

If it does, then the wnt_rename() function may need some help with
updating the permissions in rcs.c in the RCS_set_attic() function.

> Can anyone help?
>
`