The command used was:
svn merge -r25629:25630 svn+ssh://bugman@.../svn/relax/tags/3.3.0 .
.....
r25630 | bugman | 2014-09-04 16:33:24 +0200 (Thu, 04 Sep 2014) | 7 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
Python 2 vs. 3 compatibility fix for the pickle module.
This is for the estimate_errors*.py scripts in the directory
test_suite/shared_data/curve_fitting/numeric_topology/. The lib.compat.pickle module is now used to
allow both Python versions to run relax.
.....