In our usage, we branch for development and merge from time to time upwards.
For example, branch A and B, develop on A and B for some time, then merge A to B. More than one merge occurs from A to B so we use merging point tags so that we only merge from A.X to B.
The problem is that newly added files don't get tagged. So, if a file was added after tagging A.2, merging A.2 to B would miss that file.
Are there any solutions to this problem?
While we're here, are there any other pitfalls of cvs merging we should be watching out for?