At work I use ClearCase and SourceSafe, but have found some time to do some time to code for myself enroute thanks to a disposable laptop.

However, I wish I had a lightweight VCS on my system using which I would be able to make changes to my code during the commute and then push/grab them from my Linux systems.

I use git on my home system, but I can't really get it working on Windows. I don't want all that cygwin hack.

If it does not run natively on Windows, it just won't do.

What have you guys tried on your Windows system? Something that YOU use.

The big player at the moment seems to be Mercurial?

What would be best for a one (or maybe two) man team?

I just need to maintain :

1. Versioned copies of source code.

Checking in and out should be as less obtrusive as possible.

I am looking forward to a multiple Undo kind of feature (like that in an EMacs buffer) but persistent.

1. I really like the way git keeps track of lines moving between files in a source code set

2. I should be able to move part(s)/sub tree(s) of the source tree (each sub tree implies a module/plugin to my the main software I am building) to an archival system either completly or partially and restore them back from the archive as and when required and the system should track any changes to this tree as well.

I actually want to experiment with my code as much as possible without me manually keeping track of what I modified and what I need to undo once I try out some idea, so that I am back to where I want to continue from.

Notes : A similar topic came up a year ago : http://stackoverflow.com/questions/4670/dvcs-choices-whats-good-for-windows I hope things have changed, and I really want people to share their own, real life experiences. Not something they recommend without using it or they think will work.