More fixes to handle the case when there are mixed CVS/SVN