Feeling bad after branching

We've reached an important point: branching the CVS for 3.2. After complaining a little that things didn't went as smooth as they could I've started to work again. Now that HEAD is open and we have a 3.2 branch, it was time to get rid of development branches. So let's merge them into HEAD. I've tried to do is carefully. Made a copy of my local HEAD checkout, merged (using CVS merge) the development branch into that. So far, so good. Compiled, committed that one. Great, it worked perfectly, I only had to fix minor issues. Committed also those ones. According to the kde-cvs mails they went to HEAD. Some minutes later I've changed the formatting of a file and,