Matt Reason wrote: > I'm 100% sure. I have the branch and the head checked out into > different dirs on my desktop. The files I added to the branch are > sitting there happily but the on the main - they're gone. > > It's possible I'm going about this wrong. Let me rephrase my > question: > How do I add files to a branch and then have them show up in the Head > post merge? Is this possible or not? Yes, it should be done automatically when you merge from the branch.
Here is an example: [EMAIL PROTECTED]:$ cvs tag -b abranch T hello [EMAIL PROTECTED]:$ cvs up -r abranch cvs update: Updating . [EMAIL PROTECTED]:$ echo hi>hi [EMAIL PROTECTED]:$ cvs add hi cvs add: scheduling file `hi' for addition on branch `abranch' cvs add: use 'cvs commit' to add this file permanently [EMAIL PROTECTED]:$ cvs ci -m 'branch' hi RCS file: /cvs/cvs-test/jhyslop/Attic/hi,v done Checking in hi; /cvs/cvs-test/jhyslop/Attic/hi,v <-- hi new revision: 1.1.2.1; previous revision: 1.1 done [EMAIL PROTECTED]:$ cvs st hi =================================================================== File: hi Status: Up-to-date Working revision: 1.1.2.1 Thu Jul 22 19:47:25 2004 Repository revision: 1.1.2.1 /cvs/cvs-test/jhyslop/Attic/hi,v Sticky Tag: abranch (branch: 1.1.2) Sticky Date: (none) Sticky Options: (none) [EMAIL PROTECTED]:$ cvs up -A cvs update: Updating . cvs update: hi is no longer in the repository [EMAIL PROTECTED]:$ cvs up -j abranch cvs update: Updating . U hi [EMAIL PROTECTED]:$ ls CVS hello hi [EMAIL PROTECTED]:$ cvs st hi =================================================================== File: hi Status: Locally Added Working revision: New file! Repository revision: 1.1 /cvs/cvs-test/jhyslop/Attic/hi,v Sticky Tag: (none) Sticky Date: (none) Sticky Options: (none) [EMAIL PROTECTED]:$ cvs ci -m "Now on the trunk" cvs commit: Examining . Checking in hi; /cvs/cvs-test/jhyslop/hi,v <-- hi new revision: 1.2; previous revision: 1.1 done [EMAIL PROTECTED]:$ Note that immediately after the merge, the file is marked as "Locally Added" and must be re-committed. > OT - Sorry about the multiple postings. This is my first post to the > group and I kept getting "mailbox full" replies. I now realize those > are the mailboxes of subscribers not the list server. Ah, I was wondering what happened. Yes, that would be Mr. Andrew Marlow of halley.open.co.uk, right? -- Jim Hyslop Senior Software Designer Leitch Technology International Inc. (http://www.leitch.com) Columnist, C/C++ Users Journal (http://www.cuj.com/experts) _______________________________________________ Info-cvs mailing list [EMAIL PROTECTED] http://lists.gnu.org/mailman/listinfo/info-cvs
