info-cvs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

How to add/commit a directory after the files therein are already added/


From: Ming Kin Lai
Subject: How to add/commit a directory after the files therein are already added/commited
Date: Wed, 19 Apr 2006 14:56:55 -0700

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





reply via email to

[Prev in Thread] Current Thread [Next in Thread]