I agree that bzr should support this. I had the exact same problem a few days ago when versioning /etc in bzr. Some config utility changed the type of an entry and the only thing I found that I could do was to bzr revert all /etc changes so that I could continue using bzr. Any message would be better than an assert fail and stack trace.... Nick