I have a coding project that I'm working on, and I'm tracking revisions using CVS. I'm working on a branch (branch1) at version 1.1.2.1.
Anyway, I created a new C file in the directory for the project, but I can't commit it. The tutorial I read on CVS said that version numbers will be assigned automatically to new files, and they will have the same revision as the latest revision of everything else. Instead, when I check the status of game.c (the new file) I get:
I have already tried releasing and checking out the project from the repository. I have already tried committing the changes to game.c. I've already tried creating the repository file manually. No matter what I do, CVS will not let me add a new file to the project. Is there any way to do this?
P.S. Please don't tell me to use a different RCS.
EDIT: I tried
and I got
The standard way of doing it does not work.
As I said, I already tried that and it didn't work. I had to delete the sticky tag, which ended up merging the versions (because it was a branch) and making the repository inaccessable for some reason. I have just deleted my entire project, as well as the CVS repository, and restored the code from my USB backups.
Location: Saint Paul, MN USA / BSD, CentOS, Debian, OS X, Solaris
Posts: 2,288
Thanks Given: 430
Thanked 480 Times in 395 Posts
Hi.
I think I can understand why cvs might not allow adds to branches. The branches are copies of main with the exception of changes to existing files. Adding a file to a branch might make merging an even more unbearable task then it usually is.
I looked through my copy of Fogel's Open Source Development with CVS and although I found no restrictions on adding files to branches, I didn't see any examples of it either.
You could try to see if any of the forums from a Google of "cvs forum -pharmacy -grocery" are still active, try another linux forum, or wait until an expert appears here.
I'd be interested in a definitive answer, although I've left cvs behind many years ago. (Somewhat ironically, I use rcs for temporary revision control, but I also use bzr for the same task.)
That's the only way I know how to do it, and it's the way given in the CVS docs in /usr/share/doc/cvs. Anyway, I've decided to try to avoid branches from now on, as merges can be unpredictable.
Location: Saint Paul, MN USA / BSD, CentOS, Debian, OS X, Solaris
Posts: 2,288
Thanks Given: 430
Thanked 480 Times in 395 Posts
Hi.
I found:
Quote:
When you add a file it is added only on the branch which you are working on (see section Branching and merging). You can later merge the additions to another branch if you want (see section Merging can add or remove files).
That suggests that you can add files to a branch, but in quick skim I saw no examples. If I get some time, I'll experiment ... cheers, drl
Google search "add file to cvs branch" had a number of hits, not all appropriate, of course.
---------- Post updated at 21:53 ---------- Previous update was at 09:53 ----------
Hi.
I installed cvs in a VM and wrote this script:
producing:
As you can see just above, the new files were added to the branch. I recall getting an error message similar to the one you posted, but I could not elicit it just now. I did not try to merge the branch into main.
This is more of an academic question for me. We used cvs at a place I worked and one person in our group was responsible for merging branches back into main for each end-of-development-phase. It was always a struggle, often taking days to get everything right.
I think you are wise to stay away from branches unless you absolutely need to deal with them. If you do need them, then you can experiment until you are comfortable.
Most of my commands are returning this error on RHEL 6 64 bit:
Also I tried installing many sofwtares, but it fails to correctly work. For example I treid installing dos2unix:
# rpm -ivh dos2unix-5.3.3-5.ram0.98.src.rpm
1:dos2unix warning: user mockbuild does not... (0 Replies)
We have an issue where we are able to check out files from unix however not from windows. On Unix I have the cvs host set to /home/group/CVSROOT but when I try and access the folder from windows I get an exception that the server refuses connection.
On unix the CVSROOT is a filer and not the... (0 Replies)
Hi Friends,
I configured CVS Repository in RHEL 5.3 Server. But connecting the CVS Repository get the error like.
# cvs -d:pserver:cvs@localhost:/backup/cvs/cvsrep login
Logging in to :pserver:cvs@localhost:2401/backup/cvs/cvsrep
CVS password:
cvs : connect to :2401 failed: Connection... (0 Replies)
Hello. I have a file of text with columns:
aaaa bbbb ccc dddd
aaaa bbbb ccc dddd
aaaa bbbb ccc dddd
How can this be converted to a .csv file?
Thanks (4 Replies)
I so desperately need a script to copy a windows csv file to my unix server and i know these should be at dummies but i have no bits. it is life & no job situation help please. thanks (1 Reply)
Hi all,
We have CVS server running for few years with absolutely no problems.
Because of conditions not depending on me, I'm forced to move some part of our repository to another server (SVN). I need to move ONLY one branch from CVS server to SVN server. The branch must be moved with all... (7 Replies)
Hi everyone..
Anybody having idea to get the latest file from CVS repository through schell scripts.
Thanks in advance.
Regards
shahid Bakshi (4 Replies)