Kaleidocore

Yet another year later and now it was my turn the get bitten by this bug ("feature"). I never managed to get past the issue and eventually I had to go by the frustrating path through shelves and complete undo's. The comment above did help me formulate a theory explaining how I ended up here, though. Before branching off the main branch I had added some irrelevant files to the ignore-list in order to safely branch without local changes. This seemed reasonable to me; the UI clearly invites me to add theses files to the ignore, and it seemingly got rid of those nagging warnings. After that I was free to branch and switch to my new child branch. What a lie that was. After my work was done I tried to check-in my changes, and it was only then I discovered a stupid merge link that never ever was able to complete, presumably because there was nothing to merge, yet it prevented me from checking in any of my changes. How this is not clearly a bug is beyond me. Turning on the option "show ignored files" just drowned out everything with thousands of files from builds and staging. I managed to find and manually edit the .ignore-file, removing all my last entries, but that didn't fix the issue of course. It appears what Plastic SCM calls "ignore" really means "hide from the user but definitively don't ignore". All of this would be so much easier if I could just take my local changes with me when switching branches. Hey Plastic, just pretend I made them in this branch instead. I feel Plastic SCM is making a simple branch-switching concept needlessly complex, it's truly one of its weakest spots.