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

[LennardL]

Hello,

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. So every
locally change must overwrite all changes in the repository.
i didn't find any command option such as "commit -overwrite" e.g.

so, is there a way to commit files without merging? or does anybody knows a
workaround for this 'workflow'?

thanks and regards
Lennard

[Arthur Barrett]

Lennard,

Post by LennardL
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

[Jim Hyslop]

Post by LennardL
so, is there a way to commit files without merging? or does anybody knows a
workaround for this 'workflow'?

No to the first question. The only workaround I know of is to rename the
file about to be updated, then update, then rename the file back. If you
do decide to take this approach, then I strongly urge you NOT TO CALL IT
A CVS CLIENT!!

The whole point of version management systems is to merge and integrate
changes made in various branches. That's why the "C" in "CVS" stands for
"Concurrent" - multiple developers can concurrently change files,
confident that their changes will not get lost. If you call your
software a CVS client, then I guarantee someone will be bitten by your
unorthodox approach.

- --
Jim Hyslop
Dreampossible: Better software. Simply. http://www.dreampossible.ca
Consulting * Mentoring * Training in
C/C++ * OOD * SW Development & Practices * Version Management

[LennardL]

the mentioned "cvs client" is just to store files some files in a local cvs
installation (and it's just for me). and i'm not concurring myself ;) ...
therefore it's ok commit/overwrite files in some cases without updating and
so on.

thanks for the hints.
LennardL