The command used was:
svn merge -r8393:8394 svn+ssh://bugman@.../svn/relax/branches/relax_disp@r18123 .
.....
r8394 | semor | 2009-01-11 21:09:38 +0100 (Sun, 11 Jan 2009) | 9 lines
Changed paths:
A /branches/relax_disp/test_suite/shared_data/curve_fitting_disp/Hansen
A /branches/relax_disp/test_suite/shared_data/curve_fitting_disp/Hansen/500_MHz (from /branches/relax_disp/test_suite/shared_data/curve_fitting_disp/dataset_1-a:8389)
A /branches/relax_disp/test_suite/shared_data/curve_fitting_disp/Hansen/800_MHz (from /branches/relax_disp/test_suite/shared_data/curve_fitting_disp/dataset_1-b:8390)
A /branches/relax_disp/test_suite/shared_data/curve_fitting_disp/Hansen/800_MHz/1000.in (from /branches/relax_disp/test_suite/shared_data/curve_fitting_disp/dataset_1-b/100
0.in:8391)
A /branches/relax_disp/test_suite/shared_data/curve_fitting_disp/Hansen/800_MHz/1000.in_sparky (from /branches/relax_disp/test_suite/shared_data/curve_fitting_disp/dataset_
1-b/1000.in_sparky:8391)
A /branches/relax_disp/test_suite/shared_data/curve_fitting_disp/Hansen/800_MHz/133.33.in (from /branches/relax_disp/test_suite/shared_data/curve_fitting_disp/dataset_1-b/1
33.33.in:8391)
A /branches/relax_disp/test_suite/shared_data/curve_fitting_disp/Hansen/800_MHz/133.33.in.bis (from /branches/relax_disp/test_suite/shared_data/curve_fitting_disp/dataset_1
-b/133.33.in.bis:8391)
A /branches/relax_disp/test_suite/shared_data/curve_fitting_disp/Hansen/800_MHz/133.33.in.bis_sparky (from /branches/relax_disp/test_suite/shared_data/curve_fitting_disp/da
taset_1-b/133.33.in.bis_sparky:8391)
A /branches/relax_disp/test_suite/shared_data/curve_fitting_disp/Hansen/800_MHz/133.33.in_sparky (from /branches/relax_disp/test_suite/shared_data/curve_fitting_disp/datase
t_1-b/133.33.in_sparky:8391)
A /branches/relax_disp/test_suite/shared_data/curve_fitting_disp/Hansen/800_MHz/200.in (from /branches/relax_disp/test_suite/shared_data/curve_fitting_disp/dataset_1-b/200.
in:8391)
A /branches/relax_disp/test_suite/shared_data/curve_fitting_disp/Hansen/800_MHz/200.in_sparky (from /branches/relax_disp/test_suite/shared_data/curve_fitting_disp/dataset_1
-b/200.in_sparky:8391)
A /branches/relax_disp/test_suite/shared_data/curve_fitting_disp/Hansen/800_MHz/266.67.in (from /branches/relax_disp/test_suite/shared_data/curve_fitting_disp/dataset_1-b/2
66.67.in:8391)
A /branches/relax_disp/test_suite/shared_data/curve_fitting_disp/Hansen/800_MHz/266.67.in_sparky (from /branches/relax_disp/test_suite/shared_data/curve_fitting_disp/datase
t_1-b/266.67.in_sparky:8391)
A /branches/relax_disp/test_suite/shared_data/curve_fitting_disp/Hansen/800_MHz/333.33.in (from /branches/relax_disp/test_suite/shared_data/curve_fitting_disp/dataset_1-b/3
33.33.in:8391)
A /branches/relax_disp/test_suite/shared_data/curve_fitting_disp/Hansen/800_MHz/333.33.in_sparky (from /branches/relax_disp/test_suite/shared_data/curve_fitting_disp/datase
t_1-b/333.33.in_sparky:8391)
A /branches/relax_disp/test_suite/shared_data/curve_fitting_disp/Hansen/800_MHz/400.in (from /branches/relax_disp/test_suite/shared_data/curve_fitting_disp/dataset_1-b/400.
in:8391)
A /branches/relax_disp/test_suite/shared_data/curve_fitting_disp/Hansen/800_MHz/400.in_sparky (from /branches/relax_disp/test_suite/shared_data/curve_fitting_disp/dataset_1
-b/400.in_sparky:8391)
A /branches/relax_disp/test_suite/shared_data/curve_fitting_disp/Hansen/800_MHz/466.67.in (from /branches/relax_disp/test_suite/shared_data/curve_fitting_disp/dataset_1-b/4
66.67.in:8391)
A /branches/relax_disp/test_suite/shared_data/curve_fitting_disp/Hansen/800_MHz/466.67.in_sparky (from /branches/relax_disp/test_suite/shared_data/curve_fitting_disp/datase
t_1-b/466.67.in_sparky:8391)
A /branches/relax_disp/test_suite/shared_data/curve_fitting_disp/Hansen/800_MHz/533.33.in (from /branches/relax_disp/test_suite/shared_data/curve_fitting_disp/dataset_1-b/5
33.33.in:8391)
A /branches/relax_disp/test_suite/shared_data/curve_fitting_disp/Hansen/800_MHz/533.33.in.bis (from /branches/relax_disp/test_suite/shared_data/curve_fitting_disp/dataset_1
-b/533.33.in.bis:8391)
A /branches/relax_disp/test_suite/shared_data/curve_fitting_disp/Hansen/800_MHz/533.33.in.bis_sparky (from /branches/relax_disp/test_suite/shared_data/curve_fitting_disp/da
taset_1-b/533.33.in.bis_sparky:8391)
A /branches/relax_disp/test_suite/shared_data/curve_fitting_disp/Hansen/800_MHz/533.33.in_sparky (from /branches/relax_disp/test_suite/shared_data/curve_fitting_disp/datase
t_1-b/533.33.in_sparky:8391)
A /branches/relax_disp/test_suite/shared_data/curve_fitting_disp/Hansen/800_MHz/600.in (from /branches/relax_disp/test_suite/shared_data/curve_fitting_disp/dataset_1-b/600.
in:8391)
A /branches/relax_disp/test_suite/shared_data/curve_fitting_disp/Hansen/800_MHz/600.in_sparky (from /branches/relax_disp/test_suite/shared_data/curve_fitting_disp/dataset_1
-b/600.in_sparky:8391)
A /branches/relax_disp/test_suite/shared_data/curve_fitting_disp/Hansen/800_MHz/66.667.in (from /branches/relax_disp/test_suite/shared_data/curve_fitting_disp/dataset_1-b/66.667.in:8391)
A /branches/relax_disp/test_suite/shared_data/curve_fitting_disp/Hansen/800_MHz/66.667.in_sparky (from /branches/relax_disp/test_suite/shared_data/curve_fitting_disp/dataset_1-b/66.667.in_sparky:8391)
A /branches/relax_disp/test_suite/shared_data/curve_fitting_disp/Hansen/800_MHz/666.67.in (from /branches/relax_disp/test_suite/shared_data/curve_fitting_disp/dataset_1-b/666.67.in:8391)
A /branches/relax_disp/test_suite/shared_data/curve_fitting_disp/Hansen/800_MHz/666.67.in_sparky (from /branches/relax_disp/test_suite/shared_data/curve_fitting_disp/dataset_1-b/666.67.in_sparky:8391)
A /branches/relax_disp/test_suite/shared_data/curve_fitting_disp/Hansen/800_MHz/733.33.in (from /branches/relax_disp/test_suite/shared_data/curve_fitting_disp/dataset_1-b/733.33.in:8391)
A /branches/relax_disp/test_suite/shared_data/curve_fitting_disp/Hansen/800_MHz/733.33.in_sparky (from /branches/relax_disp/test_suite/shared_data/curve_fitting_disp/dataset_1-b/733.33.in_sparky:8391)
A /branches/relax_disp/test_suite/shared_data/curve_fitting_disp/Hansen/800_MHz/800.in (from /branches/relax_disp/test_suite/shared_data/curve_fitting_disp/dataset_1-b/800.in:8391)
A /branches/relax_disp/test_suite/shared_data/curve_fitting_disp/Hansen/800_MHz/800.in_sparky (from /branches/relax_disp/test_suite/shared_data/curve_fitting_disp/dataset_1-b/800.in_sparky:8391)
A /branches/relax_disp/test_suite/shared_data/curve_fitting_disp/Hansen/800_MHz/866.67.in (from /branches/relax_disp/test_suite/shared_data/curve_fitting_disp/dataset_1-b/866.67.in:8391)
A /branches/relax_disp/test_suite/shared_data/curve_fitting_disp/Hansen/800_MHz/866.67.in_sparky (from /branches/relax_disp/test_suite/shared_data/curve_fitting_disp/dataset_1-b/866.67.in_sparky:8391)
A /branches/relax_disp/test_suite/shared_data/curve_fitting_disp/Hansen/800_MHz/933.33.in (from /branches/relax_disp/test_suite/shared_data/curve_fitting_disp/dataset_1-b/933.33.in:8391)
A /branches/relax_disp/test_suite/shared_data/curve_fitting_disp/Hansen/800_MHz/933.33.in.bis (from /branches/relax_disp/test_suite/shared_data/curve_fitting_disp/dataset_1-b/933.33.in.bis:8391)
A /branches/relax_disp/test_suite/shared_data/curve_fitting_disp/Hansen/800_MHz/933.33.in.bis_sparky (from /branches/relax_disp/test_suite/shared_data/curve_fitting_disp/dataset_1-b/933.33.in.bis_sparky:8391)
A /branches/relax_disp/test_suite/shared_data/curve_fitting_disp/Hansen/800_MHz/933.33.in_sparky (from /branches/relax_disp/test_suite/shared_data/curve_fitting_disp/dataset_1-b/933.33.in_sparky:8391)
A /branches/relax_disp/test_suite/shared_data/curve_fitting_disp/Hansen/800_MHz/reference.in (from /branches/relax_disp/test_suite/shared_data/curve_fitting_disp/dataset_1-b/reference.in:8391)
A /branches/relax_disp/test_suite/shared_data/curve_fitting_disp/Hansen/800_MHz/reference.in_sparky (from /branches/relax_disp/test_suite/shared_data/curve_fitting_disp/dataset_1-b/reference.in_sparky:8391)
D /branches/relax_disp/test_suite/shared_data/curve_fitting_disp/dataset_1-a
D /branches/relax_disp/test_suite/shared_data/curve_fitting_disp/dataset_1-b
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
Renamed the directories containing the sample datasets provided by Flemming Hansen.
The names are now more obvious as to their content...
This was proposed by Ed in a post at:
https://mail.gna.org/public/relax-devel/2009-01/msg00056.html
(Message-id: <7f080ed10901111037k75882ca5p6d29a4c3697659c3@...>)
.....
