I don't think we need to regularly do double probes, and it would probably be OK to support mixed stores as a special case for upgrade. That is to say that the compressed store could check for both only in this case. One advantage of keeping files compressed inside .bzr is that a recurseive grep won't inadvertently find them. -- Martin