> A simple merge won't work, because in 3.0 the codec uses bytes and in > 2.6 it uses str. Also the call to the decoding error handler has > changed, because in 3.0 the error handler could modify the mutable input > buffer. So what's the strategy then? Block the trunk revision from merging? Regards, Martin