Thanks for the pointer towards mercurial. It seems ideal for my needs, at least: not least for the ease with which I can seemingly munge together work done on my laptop and desktop, and the ease of setup.