I have a class in my vaj workspace that has been
checked out from cvs. The version number of it is
1.22. I select at the project level and do a "cvs
update". During the "cvs update", it find that a newer
version exists in cvs, i.e. version 1.24, it then
marks this as a conflict and tries to reconcile.
In this particular case a java exception is thrown,
although I seen different behavior as well.
So the bug seems to be if it the class version is
different by one, cvs works correctly, i.e. fetches
the newer version and updates the workspace. However
if the version is more than 1, then a conflict is
detected and a merge is attempted. Obviously this
behavior is incorrect. A conflict only exists if the
mod number changes and not if the cvs reversion number
changes.
Logged In: YES
user_id=131845
Is it possible that you replaced the class with another
edition within VAJ? If the edition number doesn't match
the CVS data (presumably from your last checkout) it will
consider the class modified.