If you?ve already tried out Mercurial and liked it, you
might be interested in the Mercurial extension Mercurial Queues,
which provides an incredibly useful way of managing patch queues,
including multiple and versioned patch queues. It lets you pop
patches on and off your working tree to work on different things,
or apply other people?s changes, as you need to.