I just received a pretty large code dump for Botan that adds a number
interesting things. However all the changes are mixed together (about
10 distinct changes). And one change, that converts all bare pointers
to either shared_ptr or auto_ptr, changes nearly every file.
I have currently just moved a version into mtn based against the same
version of Botan they used and reverted changes that definitely
wouldn't go into mainline (deleting algorithms, mostly). This seems
like it would be the easiest way to handle further code dumps in the
future as well (I can just unzip into a workspace).
But if I check this in as a new branch, how do I get singular changes
out again? What is the best way to deal with a situation like this
with mtn? `pluck`? A merge tool trick? 'Don't do that then'?