You can do this with Mercurial, using mq inside your own repo. Most commands have the --mq flag, which will work in the patch queue. To start using hg init --mq ( hg qinit also works, but this template is more limited, especially since qpush will be overloaded). This creates a repo inside .hg/patches , which is independent of the main repo. Then use mq as usual. If you want to commit the fix queue, use hg commit --mq .
You can also flag and flag the --mq flag to track different chapters. Unfortunately, it seems that the Bookmarks extension does not yet support mq, which would be nice, since you probably need lightweight shortcuts. However, if you wanted to, you can set up an alias for qbookmark that simply adds -R .hg/patches , so it works with the patch queue repository.
I have not used this extensively myself, but it looks like Mercurial --mq built-in support to make this a possible solution for you.
source share