When comparing a branch agaist the base trunk, I've noticed a scenario where
WinCVS 1.1b13 (client) and CVS 1.10.6 (server) miss some of the differences
in the base trunk. In all developement branches, all changes are comitted.
When I go to the root directory of the base trunk and diff against the
branch it finds all of the changes. However, when I go the the root working
directory of the branch and compare it to "HEAD" it finds all but two
changes.
The scenario was pretty straight forward. I had been doing base development
and then made release with a release tag. Then, I created a branch based on
the new release. After that, I made several changes to the base and now
need to apply those changes to the branch. Since the diff does not report
the same changes when checking the two branches, I would like to know why
before proceeding.
Maybe this is has to do with the problem - on the file where all the changes
were not found - there are two copies of the same file in the project
(shared between client and server).
Any insights would be helpful...
Chris
