The command used was:
svn merge -r8362:8363 svn+ssh://bugman@.../svn/relax/branches/relax_disp@r18123 .
.....
r8363 | semor | 2009-01-10 21:50:01 +0100 (Sat, 10 Jan 2009) | 4 lines
Changed paths:
A /branches/relax_disp/test_suite/shared_data/curve_fitting_disp/dataset_1/1000.in_sparky
A /branches/relax_disp/test_suite/shared_data/curve_fitting_disp/dataset_1/133.33.in.bis_sparky
A /branches/relax_disp/test_suite/shared_data/curve_fitting_disp/dataset_1/133.33.in_sparky
A /branches/relax_disp/test_suite/shared_data/curve_fitting_disp/dataset_1/200.in_sparky
A /branches/relax_disp/test_suite/shared_data/curve_fitting_disp/dataset_1/266.67.in_sparky
A /branches/relax_disp/test_suite/shared_data/curve_fitting_disp/dataset_1/333.33.in_sparky
A /branches/relax_disp/test_suite/shared_data/curve_fitting_disp/dataset_1/400.in_sparky
A /branches/relax_disp/test_suite/shared_data/curve_fitting_disp/dataset_1/466.67.in_sparky
A /branches/relax_disp/test_suite/shared_data/curve_fitting_disp/dataset_1/533.33.in.bis_sparky
A /branches/relax_disp/test_suite/shared_data/curve_fitting_disp/dataset_1/533.33.in_sparky
A /branches/relax_disp/test_suite/shared_data/curve_fitting_disp/dataset_1/600.in_sparky
A /branches/relax_disp/test_suite/shared_data/curve_fitting_disp/dataset_1/66.667.in_sparky
A /branches/relax_disp/test_suite/shared_data/curve_fitting_disp/dataset_1/666.67.in_sparky
A /branches/relax_disp/test_suite/shared_data/curve_fitting_disp/dataset_1/733.33.in_sparky
A /branches/relax_disp/test_suite/shared_data/curve_fitting_disp/dataset_1/800.in_sparky
A /branches/relax_disp/test_suite/shared_data/curve_fitting_disp/dataset_1/866.67.in_sparky
A /branches/relax_disp/test_suite/shared_data/curve_fitting_disp/dataset_1/933.33.in.bis_sparky
A /branches/relax_disp/test_suite/shared_data/curve_fitting_disp/dataset_1/933.33.in_sparky
M /branches/relax_disp/test_suite/shared_data/curve_fitting_disp/dataset_1/readme
A /branches/relax_disp/test_suite/shared_data/curve_fitting_disp/dataset_1/reference.in_sparky
M /branches/relax_disp/test_suite/system_tests/scripts/relax_disp_cpmg_fast.py
Added 'Sparky' formatted files to the system-test so the files can be input and development of the
branch continued.
.....