TFS and Baseless Merging

Whoever thought it was a good idea to not allow sane branching and merging and introduced in its stead "baseless merges," should probably never work on a source control project again.

I'm now relegated to losing all sorts of history in order to stage complex feature branches by just using .patch files. Thanks for wasting my afternoon. Yet another reason to use TRAC/SVN instead of TFS.