info-cvs
[Top][All Lists]
Advanced

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

Re: commit problem in CVS


From: Spiro Trikaliotis
Subject: Re: commit problem in CVS
Date: Sat, 21 Apr 2007 10:48:52 +0200
User-agent: Mutt/1.5.9i

Hello,

* On Sat, Apr 21, 2007 at 12:30:26PM +0800 hch wrote:
> CVSNT2.5.03+eclipse3.2.2 in win2k pro

Note that CVSNT is another product, which has its own mailing list. Go
to http://www.cvsnt.com/ for more info on CVSNT.

> when I modified a .java file and committed it to CVS repository ,an error 
> comes out
> 
> server reported an error while performing "cvs add" command
> details
> The server reported an error while performing the "cvs add" command.
>   Ttak: cvs server: ArrayCasting.java added independently by second party
> 
> how can i resolve it?? 

The output is telling you that you want to add a file. Anyway, another
one (a co-worker?) already added this file to the repository. So, your
local file does not have any version information, thus, CVSNT does not
know how to add the file.

If you are really sure that the file is from the repository, and CVSNT
still outputs this message, you might have found an error in CVSNT. You
might want to report it to the CVSNT team. The output of "cvs status"
might be helpful to decide if this is a bug or not.


Anyway, you should be able to work-around your problem by doing the following:

1. Rename your .java file to another name (for example, if the file is
   XXX.java, you might use renamed_xxx.java)

2. Update your Sandbox. This should get the file from the repository,
   thus, CVS "knows" now about the version information

3. Compare the files (xxx.java and renamed_xxx.java), for example, by
   using the "diff" tool. Decide if you really want to check in your
   version, or if you want to use the one from the repository.

3a. If you do not want to check in your version, stop here.

3b. If you decided that you want to use the version from the repositry,
    but incorporate changes from your file, change the file xxx.java to
    your needs, and go to step 4.

3c. If you decided you want to use your file version, and the old one
    can be discarded, re-think about it, ;) speak with your collegue,
    and if you still want this, then delete xxx.java and rename
    renamed_xxx.java to xxx.java. Then, proceed with step 4.

4. Now, you can check in your changes.

HTH,
   Spiro.

-- 
Spiro R. Trikaliotis                              http://opencbm.sf.net/
http://www.trikaliotis.net/                     http://www.viceteam.org/




reply via email to

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