The GLUT basecode

I'm not entirely sure what the state of the svn is (its down right now), but the only difference between the glut and sdl basecodes should ideally be the implementation of the glWindow class.

Also, has anyone investigated using branches to simplify changes to the svn? As it stands it seems that if you need to change a piece of the basecode, the change has to be mirrored in the rest of the lessons.

One idea is to use the svn:externals property to pull in files (or at least, directories) from different areas of the repository.

There is also a trick to make several projects in MSVC link as if they were the one project (off the top of my head, you need to set the "link dependencies" and "link as objects" options). This way you don't have to spend time maintaining file addition and removal across lots of different project files.

For some time on my own projects, I was manually merging changes across project files. Later I even wrote a script to automate this process. Neither of these are really reliable enough, though.

Branches maybe?

Well - branches work. The main problem is that you still have to manually duplicate any changes using the merge feature.