info-cvs
[Top][All Lists]
Advanced

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

RE: How to add/commit a directory after the files therein are already ad


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


If you want to use the versions from the repository, then you can just
delete the files in your doc/ directory.  If you want to use your copies,
then you'll need to move them to another location, perform the update and
then move them back.

Well, it did not work.
% cvs up -r v3_0_6
cvs update: Updating .
%
That is, no files are updated.  Then I took a look at CVS/Entries
% cat CVS/Entries
D
That is, it has only one letter D there.
So, I checked out v3_0_5 and moved the CVS directory from the v3_0_5 working directory to my 3.0.6 working directory. Then I did a commit. Well, it did not work:
%cvs commit -m "updated for version 3.0.6" ChangeLog
cvs commit: sticky tag `v3_0_5' for file `ChangeLog' is not a branch
cvs [commit aborted]: correct above errors first!
The reason appears to be that the sticky tag of the files is now v3_0_5 not VERSION3 :
% cvs status -v | more
cvs status: Examining .
=============================================
File: ChangeLog         Status: Up-to-date

  Working revision:    1.1.2.2 Sat Jan 14 05:05:53 2006
Repository revision: 1.1.2.2 /home/messengr/cvs/messengers/doc/Attic/ChangeLog,v
  Sticky Tag:          v3_0_5 (revision: 1.1.2.2)
  Sticky Date:         (none)
  Sticky Options:      (none)

  Existing Tags:
       v3_0_5                          (revision: 1.1.2.2)
       v3_0_4                          (revision: 1.1.2.1)
       VERSION3                           (branch: 1.1.2)

_________________________________________________________________
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]