The commands used were:
svn merge -r11697:11698 svn+ssh://bugman@.../svn/relax/branches/relax_disp/specific_fns/@r18123 specific_analyses
svn merge -r11697:11698 svn+ssh://bugman@.../svn/relax/branches/relax_disp/test_suite/@r18123 test_suite
.....
r11698 | bugman | 2010-11-23 14:02:38 +0100 (Tue, 23 Nov 2010) | 6 lines
Changed paths:
M /branches/relax_disp/dep_check.py
M /branches/relax_disp/prompt/relax_disp.py
M /branches/relax_disp/specific_fns/relax_disp.py
M /branches/relax_disp/specific_fns/relax_fit.py
M /branches/relax_disp/test_suite/system_tests/relax_disp.py
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
M /branches/relax_disp/test_suite/unit_tests/_prompt/test_relax_disp.py
Brought the relaxation dispersion branch into sync with the 1.3 line.
There were many design changes within the 1.3 line that required that the old relaxation dispersion
code be updated.
.....