The command used was:
svn merge -r8394:8395 svn+ssh://bugman@.../svn/relax/branches/relax_disp@r18123 .
.....
r8395 | semor | 2009-01-11 21:21:13 +0100 (Sun, 11 Jan 2009) | 6 lines
Changed paths:
D /branches/relax_disp/test_suite/shared_data/curve_fitting_disp/Hansen/500_MHz/fake_sequence.in
D /branches/relax_disp/test_suite/shared_data/curve_fitting_disp/Hansen/500_MHz/readme
D /branches/relax_disp/test_suite/shared_data/curve_fitting_disp/Hansen/800_MHz/readme
A /branches/relax_disp/test_suite/shared_data/curve_fitting_disp/Hansen/800_MHz/unresolved
A /branches/relax_disp/test_suite/shared_data/curve_fitting_disp/Hansen/fake_sequence.in (from /branches/relax_disp/test_suite/shared_data/curve_fitting_disp/Hansen/500_MHz
/fake_sequence.in:8394)
A /branches/relax_disp/test_suite/shared_data/curve_fitting_disp/Hansen/readme (from /branches/relax_disp/test_suite/shared_data/curve_fitting_disp/Hansen/500_MHz/readme:83
94)
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 an 'unresolved' file to the 800 MHz data and moved (and modified) some files (sequence and
readme) so there is only one copy for the 500 and 800 MHz data.
This prevents duplicated files.
.....