I have added a "directx8" branch to the CVS repository, and reverted the main branch to the pre-dx8 changes.
What this means:
If you want the non-directx8 stuff, just do a normal "cvs checkout" or "cvs export" -- "cvs update" will also get the stuff from the main branch as always. What's there is essentially the same as it was with the 3.2 release, I think one or two files may have been tweaked.
If you want to work on the directx8 stuff: you will need to specify the 'directx8' tag in your checkout, e.g., cvs checkout -r directx8 fs2_open You will get all of the directx stuff that's in the repository. Please note that any changes you make will be committed to the directx8 branch, not the main branch. I think you can switch your current working copy to use the branch by saying cvs update -b directx8 but I'm not 100% sure.
Also note that this is a "sticky" tag -- you only need to do this once; any further updates or commits will automatically be on the directx8 branch.
Please make sure you back up any files you may have changed locally before trying anything...
I know it's a little confusing, so I apologize. My sincere thanks to RandomTiger and everyone eles who is working on this, but Inquisitor and I both think it's better for now to keep the paths separate. Hopefully we will be able to merge the two in the not-too distant future.