The command used was:
svn merge -r25628:25629 svn+ssh://bugman@.../svn/relax/tags/3.3.0 .
.....
r25629 | bugman | 2014-09-04 16:31:00 +0200 (Thu, 04 Sep 2014) | 6 lines
Changed paths:
M /tags/3.3.0/test_suite/shared_data/curve_fitting/numeric_topology/estimate_errors.py
M /tags/3.3.0/test_suite/shared_data/curve_fitting/numeric_topology/estimate_errors_analyse.py
M /tags/3.3.0/test_suite/shared_data/curve_fitting/numeric_topology/estimate_errors_analyse_relax.py
M /tags/3.3.0/test_suite/system_tests/relax_disp.py
Python 3 fixes via the 2to3 compatibility script.
The command used was:
2to3 -w -f except -f import -f imports -f long -f numliterals -f xrange .
.....