Some kind of diplomatic progress is now under way, but is it enough to prevent a return to war?