The command used was:
svn merge -r8388:8389 svn+ssh://bugman@.../svn/relax/branches/relax_disp@r18123 .
.....
r8389 | semor | 2009-01-11 18:28:31 +0100 (Sun, 11 Jan 2009) | 6 lines
Changed paths:
D /branches/relax_disp/test_suite/shared_data/curve_fitting_disp/dataset_1
A /branches/relax_disp/test_suite/shared_data/curve_fitting_disp/dataset_1-a (from /branches/relax_disp/test_suite/shared_data/curve_fitting_disp/dataset_1:8362)
A /branches/relax_disp/test_suite/shared_data/curve_fitting_disp/dataset_1-a/1000.in_sparky (from /branches/relax_disp/test_suite/shared_data/curve_fitting_disp/dataset_1/1
000.in_sparky:8363)
A /branches/relax_disp/test_suite/shared_data/curve_fitting_disp/dataset_1-a/133.33.in.bis_sparky (from /branches/relax_disp/test_suite/shared_data/curve_fitting_disp/datas
et_1/133.33.in.bis_sparky:8363)
A /branches/relax_disp/test_suite/shared_data/curve_fitting_disp/dataset_1-a/133.33.in_sparky (from /branches/relax_disp/test_suite/shared_data/curve_fitting_disp/dataset_1
/133.33.in_sparky:8363)
A /branches/relax_disp/test_suite/shared_data/curve_fitting_disp/dataset_1-a/200.in_sparky (from /branches/relax_disp/test_suite/shared_data/curve_fitting_disp/dataset_1/20
0.in_sparky:8363)
A /branches/relax_disp/test_suite/shared_data/curve_fitting_disp/dataset_1-a/266.67.in_sparky (from /branches/relax_disp/test_suite/shared_data/curve_fitting_disp/dataset_1
/266.67.in_sparky:8363)
A /branches/relax_disp/test_suite/shared_data/curve_fitting_disp/dataset_1-a/333.33.in_sparky (from /branches/relax_disp/test_suite/shared_data/curve_fitting_disp/dataset_1
/333.33.in_sparky:8363)
A /branches/relax_disp/test_suite/shared_data/curve_fitting_disp/dataset_1-a/400.in_sparky (from /branches/relax_disp/test_suite/shared_data/curve_fitting_disp/dataset_1/40
0.in_sparky:8363)
A /branches/relax_disp/test_suite/shared_data/curve_fitting_disp/dataset_1-a/466.67.in_sparky (from /branches/relax_disp/test_suite/shared_data/curve_fitting_disp/dataset_1
/466.67.in_sparky:8363)
A /branches/relax_disp/test_suite/shared_data/curve_fitting_disp/dataset_1-a/533.33.in.bis_sparky (from /branches/relax_disp/test_suite/shared_data/curve_fitting_disp/datas
et_1/533.33.in.bis_sparky:8363)
A /branches/relax_disp/test_suite/shared_data/curve_fitting_disp/dataset_1-a/533.33.in_sparky (from /branches/relax_disp/test_suite/shared_data/curve_fitting_disp/dataset_1
/533.33.in_sparky:8363)
A /branches/relax_disp/test_suite/shared_data/curve_fitting_disp/dataset_1-a/600.in_sparky (from /branches/relax_disp/test_suite/shared_data/curve_fitting_disp/dataset_1/60
0.in_sparky:8363)
A /branches/relax_disp/test_suite/shared_data/curve_fitting_disp/dataset_1-a/66.667.in_sparky (from /branches/relax_disp/test_suite/shared_data/curve_fitting_disp/dataset_1
/66.667.in_sparky:8363)
A /branches/relax_disp/test_suite/shared_data/curve_fitting_disp/dataset_1-a/666.67.in_sparky (from /branches/relax_disp/test_suite/shared_data/curve_fitting_disp/dataset_1
/666.67.in_sparky:8363)
A /branches/relax_disp/test_suite/shared_data/curve_fitting_disp/dataset_1-a/733.33.in_sparky (from /branches/relax_disp/test_suite/shared_data/curve_fitting_disp/dataset_1
/733.33.in_sparky:8363)
A /branches/relax_disp/test_suite/shared_data/curve_fitting_disp/dataset_1-a/800.in_sparky (from /branches/relax_disp/test_suite/shared_data/curve_fitting_disp/dataset_1/80
0.in_sparky:8363)
A /branches/relax_disp/test_suite/shared_data/curve_fitting_disp/dataset_1-a/866.67.in_sparky (from /branches/relax_disp/test_suite/shared_data/curve_fitting_disp/dataset_1
/866.67.in_sparky:8363)
A /branches/relax_disp/test_suite/shared_data/curve_fitting_disp/dataset_1-a/933.33.in.bis_sparky (from /branches/relax_disp/test_suite/shared_data/curve_fitting_disp/datas
et_1/933.33.in.bis_sparky:8363)
A /branches/relax_disp/test_suite/shared_data/curve_fitting_disp/dataset_1-a/933.33.in_sparky (from /branches/relax_disp/test_suite/shared_data/curve_fitting_disp/dataset_1
/933.33.in_sparky:8363)
R /branches/relax_disp/test_suite/shared_data/curve_fitting_disp/dataset_1-a/readme (from /branches/relax_disp/test_suite/shared_data/curve_fitting_disp/dataset_1/readme:83
63)
A /branches/relax_disp/test_suite/shared_data/curve_fitting_disp/dataset_1-a/reference.in_sparky (from /branches/relax_disp/test_suite/shared_data/curve_fitting_disp/datase
t_1/reference.in_sparky:8363)
A /branches/relax_disp/test_suite/shared_data/curve_fitting_disp/dataset_1-a/unresolved (from /branches/relax_disp/test_suite/shared_data/curve_fitting_disp/dataset_1/unres
olved:8365)
M /branches/relax_disp/test_suite/system_tests/scripts/relax_disp_cpmg_fast.py
M /branches/relax_disp/test_suite/system_tests/scripts/relax_disp_cpmg_slow.py
Added details to the readme file and changed the directory name where the sample data is located.
The directory is now named 'dataset_1-a'. This contains data recorded at 500 MHz. Data recorded at
800 MHz will be put in a directory called 'dataset_1-b'.
.....
