svnmerge.py block -r61529

Add py3k warnings for object, type, cell and dict comparisons. This should resolve issue2342 and partly resolve issue2373.