Re: (no subject)

[Torbjörn Axelsson]

"Amitabh Trivedy" <address@hidden> writes:

> Hi,
> I'm getting this  error
> 
> 1."cvs server: cmgi_us_hr_ldap_phone_view.sql added independently by
> second party " .I added the file from Unix .
> 2. cannot add file <filename> when RCS file <filename> already exists.
> When i was trying to add the same file from CVS .
> 
> 
> Could you tell me pls how to get out of this error ?
> 
> 

The error I get when I try to reproduce the situation using local
repository access is:
>address@hidden deadbranch]$ cvs update
>cvs update: conflict: fnord created independently by second party
>C fnord

It it most easily solved using:

$mv fnord gata
$cvs delete fnord
$cvs update
U fnord
? gata

Now you can check if there are any differences betweem "fnord" and
"gata". 

Running update without cvs delet will give you "cvs update: warning:
new-born fnord has disappeared"

rgds/Torbjörn