Hmm, I don't see how.. The changeset IDs assigned to the files of the shelveset are the IDs they would have if had been checked-in separately (Or at least, it seems so). How would, then, TFS know how to unshelve it?

Could you describe a scenario where the computed BaseChangesetId is the wrong one?

Thanks!