[development] how to fix a cvs branching error?