> And finally, does hg support updating the local repository without > (temporarily) throw away my local changes? > As far as I understand, that takes 3-4 commands with git which I find > very annoying (git stash, git rebase, git stash apply[, git stash > clear]) -- or is that only relevant when working with SVN as a source > repository? Assuming no conflicts, an update in hg is always hg pull && hg update (there's also an extension that lets you combine these into a single hg fetch command). I'm actually surprised to learn git can't merge changes like that.