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

[Wiest, Damian]

CVS won't allow you to commit a file to a directory it doesn't know about.
You'll get an error stating, "there is no version here; do 'cvs checkout'
first".

Based on the revision number, it looks to me like you initially added the
doc directory, Manual.tex, etc. to the version3 branch.  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.

-Damian

> -----Original Message-----
> From: Ming Kin Lai [mailto:address@hidden 
> Sent: Wednesday, April 19, 2006 4:57 PM
> To: address@hidden
> Subject: How to add/commit a directory after the files 
> therein are already added/commited
> 
> 
> I started this project last summer so I don't t remember 
> exactly how I did 
> certain things.
> The project initially had 2 directories and I added a new one 
> - doc/ - in my 
> working directory.  And I have a Manual.tex under this doc 
> directory.  
> Apparently I managed to cvs-add and cvs-commit Manual.tex but 
> apparently I 
> did not cvs-add and cvs-commit doc.  And apparently cvs never 
> complained.  
> And now when I checked out the project from the repository, the doc 
> directory and the files therein are missing.  So I went back 
> to add doc, and 
> CVS said something about "added independently by second 
> party".  And a CVS 
> directory was created under doc:
> % pwd
> /home/minglai/myproj/doc/CVS
> address@hidden ls
> Entries      Repository   Root         Tag
> % cd ..
> % cvs status -v Manual.tex
> cvs status: move away Manual.tex; it is in the way 
> ======================================================
> File: Manual.tex        Status: Unresolved Conflict
> 
>    Working revision:    No entry for Manual.tex
>    Repository revision: 1.1.2.2 
> /home/messengr/cvs/myproj/doc/Attic/Manual.tex,v
> 
>    Existing Tags:
>         v3_0_5                          (revision: 1.1.2.2)
>         v3_0_4                          (revision: 1.1.2.1)
>         version3                           (branch: 1.1.2)
> 
> What should I do to add/commit doc so that when I check out 
> the project, doc 
> and its content would be available?  thx.
> 
> _________________________________________________________________
> On the road to retirement? Check out MSN Life Events for 
> advice on how to 
> get there! http://lifeevents.msn.com/category.aspx?cid=Retirement
> 
> 
> 
> _______________________________________________
> info-cvs mailing list
> address@hidden http://lists.nongnu.org/mailman/listinfo/info-cvs
> 



============================== 
 
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