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).
% ./run1
Environment: LC_ALL = C, LANG = C
(Versions displayed with local utility "version")
OS, ker|rel, machine: Linux, 2.6.32-29-generic, i686
Distribution : Ubuntu 10.04.2 LTS (lucid)
GNU bash 4.1.5
cvs - ( /usr/bin/cvs Nov 10 2008 )
-----
Results:
CVSROOT
N myproj/collected.c
N myproj/main.c
No conflicts created by this import
cvs checkout: Updating myproj
U myproj/collected.c
U myproj/main.c
total 12
drwxr-x--- 2 drl drl 4096 Mar 13 21:30 CVS
-rw-r--r-- 1 drl drl 46 Mar 13 21:30 collected.c
-rw-r--r-- 1 drl drl 220 Mar 13 21:30 main.c
cvs tag: Tagging .
T collected.c
T main.c
cvs tag: Tagging .
T collected.c
T main.c
cvs update: Updating .
cvs add: scheduling file `suba.c' for addition on branch `new_stuff_1'
cvs add: use `cvs commit' to add this file permanently
cvs add: scheduling file `subb.c' for addition on branch `new_stuff_1'
cvs add: use `cvs commit' to add this file permanently
cvs commit: Examining .
/home/drl/try/user-problem/1019/repo/myproj/Attic/suba.c,v <-- suba.c
new revision: 1.1.2.1; previous revision: 1.1
/home/drl/try/user-problem/1019/repo/myproj/Attic/subb.c,v <-- subb.c
new revision: 1.1.2.1; previous revision: 1.1
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.
Hi everyone..
Anybody having idea to get the latest file from CVS repository through schell scripts.
Thanks in advance.
Regards
shahid Bakshi (4 Replies)
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)
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)
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)
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)
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)
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)
Discussion started by: India_2014
0 Replies
LEARN ABOUT DEBIAN
cvs-switchroot
CVS-SWITCHROOT(1) BSD General Commands Manual CVS-SWITCHROOT(1)NAME
cvs-switchroot -- change repository or tag in a cvs working copy
SYNOPSIS
cvs-switchroot [-T] newroot [file ...]
cvs-switchroot [-T] - srcpath [file ...]
DESCRIPTION
The cvs-switchroot utility manipulates a CVS working copy directly, modifying the information stored in the administrative subdirectory and
saving space by hardlinking if possible.
If the -T option is given, the sticky tag is operated on, otherwise, the repository path (CVSROOT).
The information (Tag or Root) is set to the same as in srcpath if the first non-option argument newroot is a sole dash ('-'), the literal
value newroot otherwise.
EXAMPLES
Change all Root information in the current sandbox to /cvs:
$ cvs-switchroot /cvs .
Set all roots in the current working directory and all its subdirectories to the Root of the parent directory:
$ cvs-switchroot - .. .
Hardlink the Tag information in the current working directory, for example /usr/src, and /usr/ports with each other:
$ cvs-switchroot -T - . . /usr/ports
SEE ALSO cvs(1)HISTORY
cvs-switchroot has existed in the MirBSD source tree since 2005. It was added to Debian's cvs package in 2011.
CAVEATS
cvs-switchroot depends on mksh.
BSD June 10, 2011 BSD