RE: How to add/commit a directory after the files therein are alr eady added/commited

[Wiest, Damian]

> -----Original Message-----
> From: Ming Kin Lai [mailto:address@hidden 
> Sent: Wednesday, April 19, 2006 5:46 PM
> To: address@hidden
> Subject: RE: How to add/commit a directory after the files 
> therein are already added/commited
> 
> 
> >Based on the revision number, it looks to me like you 
> initially added 
> >the doc directory, Manual.tex, etc. to the version3 branch.
> The how do you explain the fact that when I now check out the 
> project, doc 
> is missing?
> % cvs -d /home/messengr/cvs checkout -r v3_0_6 myproj
> % cd myproj/
> % ls
> AUTHORS    CVS/       Makefile   NEWS       Readme     
> compiler/  daemon/
> (doc is missing)

I would guess that no files under doc/ got tagged with v3_0_6.

> >I believe you're
> >getting the "move away" message because the Manual.tex file 
> in your doc 
> >directory has a timestamp newer than the version in the CVS 
> repository.  
> >If you want to keep this copy instead of the one in the repository, 
> >then move it somewhere temporarily, perform the following operations 
> >and move it back before performing the commit.  Update 
> myproj to remove 
> >any sticky tags and add new directories (cvs up -Ad).  Once 
> you've done 
> >that, you can merge the doc directory and its content from 
> the version3 
> >branch to the trunk with, "cvs up -j version3 doc" and then 
> commit the 
> >changes.
> I want the files in the branch.  I do not want to move them 
> to the  truck.

Sorry, I misunderstood.  If you're talking about version3, then Manual.tex
_is_ on that branch; if you're talking about v3_0_6, it's a non-branch tag.
Does a "cvs up -dr version3" give you a doc/ directory?  If so, just tag it
with v3_0_6 and you should see your files when you check the project out.

-Damian



============================== 
 
Confidentiality Notice:  
 
  
 
The content of this communication, along with any attachments, is the property 
of the sender, is covered by  
federal and state law governing electronic communications and may contain 
confidential and legally privileged 
information.  If the reader of this message is not the intended recipient, you 
are hereby notified that any  
dissemination, distribution, use or copying of the information contained herein 
is strictly prohibited.  If you have  
received this communication in error, please immediately contact us by email at 
address@hidden, destroy  
any copies or print outs of this e-mail and permanently delete the original 
e-mail.  Thank you