Hi Mario,
I think you are not getting the updates correctly, you should not be doing any merging nor using the joedev branch for anything, that is my developer sandbox, I merge my changes from there into the default branch and you should always use the default branch and never use my sandbox branch.
After you pull all change sets by using the green down arrow in Repository Explorer, then you need to close out of Repository explorer and right click the topmost folder and choose TortoiseHG > Update to apply the change sets to your working copy. In the update dialog make sure it points to the default branch do not update to my joedev branch.
I'm not sure the implications of the merging you did, you may need to get a clean clone of the repository if all else fails.
Hope it helps,
Joe