RE: How to commit files with "Up-to-Date"-conflict WITHOUT merging?

[Arthur Barrett]

Lennard,

> i'm working on a small java cvs client (using netbeans cvs 
> api) and i'm in
> trouble with committing files with "Up-to-Date"-conflicts. 
> The only thing i need is just to commit locally changed files WITHOUT
> MERGING or UPDATING because
> merging files is not provided (and not needed) in my 
> application. 


You cannot commit unless the version number of the file in the sandbox
is equal to the latest revision in the repository (for the current
branch).  This is usually achieved with update.  

Update is not necessarily a merge, but update usually updates the CVS
control files as well as the sandbox file (merge) though if you are
writing it you could skip that last part...

Regards,


Arthur