This is a real pain for me. I guess the work-around is a clean checkout ....