Police have shifted tactics at flashpoint sites and diplomats have shuttled back and forth in an attempt to keep tensions in the city low during Ramadan. Will it last?