[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
RE: How to add/commit a directory after the files therein are alr eady a
RE: How to add/commit a directory after the files therein are alr eady added/commited
Wed, 19 Apr 2006 18:42:53 -0500
> -----Original Message-----
> From: Ming Kin Lai [mailto:address@hidden
> Sent: Wednesday, April 19, 2006 6:31 PM
> To: address@hidden
> Subject: RE: How to add/commit a directory after the files
> therein are already added/commited
> >I would guess that no files under doc/ got tagged with v3_0_6.
> You are right. When I checked out v3_0_5, doc is there.
> >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/
> >If so, just tag it with v3_0_6 and you should see your files
> when you
> >check the project out.
> % cvs up -dr MESS3
> cvs update: Updating doc
> cvs update: move away doc/ChangeLog; it is in the way
> C doc/ChangeLog
> cvs update: move away doc/CodingStyle.txt; it is in the way
> C doc/CodingStyle.txt
> cvs update: move away doc/Makefile; it is in the way
> C doc/Makefile
> cvs update: move away doc/Manual.tex; it is in the way
> C doc/Manual.tex
> cvs update: move away doc/tutorial.doc; it is in the way
> C doc/tutorial.doc
> % cd doc
> % 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: 22.214.171.124
> Existing Tags:
> v3_0_5 (revision: 126.96.36.199)
> v3_0_4 (revision: 188.8.131.52)
> MESS3 (branch: 1.1.2)
> Now what should I do? How do I "move away" files in doc?
> And how do i
> resolve the conflicts in those files? What i open those
> files, I do not see
> any conflicts indicated in the files. I cannot tag those
> files unless I
> resolve the conflicts first.
> And I do not have ~/.cvsrc.
CVS is telling you that it wants to put a copy of the file from the
repository into your doc/ directory, but can't because it doesn't want to
overwrite the existing file which has a newer timestamp.
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.
ps. Sorry about the footer.
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
any copies or print outs of this e-mail and permanently delete the original
e-mail. Thank you