trying to salvage some credibility here.. :)
That's not quite how CVS handles vendor imports. If a file on the trunk has no local modifications then yes, it is replaced with the one from the import and that change will show up in your working copy the next time you update. However, files with local modifications aren't automatically merged by CVS or anything like that. The import command tells you that you need to do a merge, and shows you how -
1 conflicts created by this import.
Use the following command to help the merge:
cvs checkout -jvendor:yesterday -jvendor module
so when you do this checkout CVS does the merge (and you manually resolve any conflicts) - it's the same process as merging changes from any other branch back to the trunk. There is no indication when you update your existing working copy that you need to do this, just the output from the import.
The branching you see is actually correct - since standard.adp hasn't had any changes made to it, the tip of the trunk, the tip of the vendor branch and the tip of the release branch are all the same file and CVS seems to want to show the "most branched" interpretation. If you commit a change to that file on the release branch then it should collapse back to being branched off the trunk as Andrew described in the 00:15:21 post...
