The MQ extension for Mercurial lets you manipulate and version control the _patches_ as well as the actual code. It's kinda weird -- "higher-order version control".