PDA

View Full Version : Vendor branches and adding files subsequently


Frank A. Uepping
11-05-2003, 02:25 PM
Hi,
look at this session:

# Some initial import:
cvs im -m "blahblah" foo them foo_1_0

# Check out foo and alter some files:
cvs co foo
edit...
cvs ci -m "blahblah"

# Oops have forgotten a file in my initial import.
# Lets add the file subsequently to the vendor branch instead of doing
# a complete new import (because I am lazy ;)
cvs up -r them
copy .../bar.c .

cvs ad -r 1.1.1 bar.c
cvs commit: cannot add file `bar.c' with revision `1.1.1'; must be on trunk
cvs [commit aborted]: correct above errors first!
# Doesn't work, why (them is branch:1.1.1)?

cvs ad -r them bar.c
# Creates a new branch 1.1.2 with bar.c as the only file.

Apparently I can't add files to a vendor branch subsequently, is that true?
What is with `-r them' variant; is the automatic creation of the branch
1.1.2 a defined feature or a bug?

/FAU


MyLounge.com Site Map
Forum: Cars, Cell Phone, Database, Games, Home Improvement, IT, Music, School, Sports, Web Design, Web Server, Weight Loss

The MyLounge.com forum is intended for informational use only and should not be relied upon and is not a substitute for any advice. The information contained on MyLounge.com are opinions and suggestions of members and is not a representation of the opinions of MyLounge.com. MyLounge.com does not warrant or vouch for the accuracy, completeness or usefulness of any postings or the qualifications of any person responding. Please consult a expert or seek the services of an attorney in your area for more accuracy on your specific situation. Please note that our forums also serve as mirrors to Usenet newsgroups. Many posts you see on our forums are made by newsgroup users who may not be members of MyLounge.com Term of Service