An improved version of cvsps and git-cvsimport that deals with multiple tags and weird branching