[cvsnt] But... (was: No conflict when merging, where one isexpected)

[Glen Starrett]

> - development goes on and due refactoring FileA is renamed to 
> FileB (or 
> moved to somewhere else in the project)

I see what you mean here.  That is a tough one with the way CVS is set
up now (file oriented, no directory versioning).  Tony is working on a
database version that can add directory versioning, and SubVersion I
THINK has something along those lines but AFAIK they are still in alpha.


Glen Starrett