The commands used were:
svn merge -r8344:8345 svn+ssh://bugman@.../svn/relax/branches/relax_disp/specific_fns/@r18123 specific_analyses
svn merge -r8344:8345 svn+ssh://bugman@.../svn/relax/branches/relax_disp/test_suite/@r18123 test_suite
The prompt package changes were manually ported to the user_functions package.
.....
r8345 | semor | 2009-01-08 20:30:41 +0100 (Thu, 08 Jan 2009) | 4 lines
Changed paths:
M /branches/relax_disp/prompt/relax_disp.py
M /branches/relax_disp/specific_fns/relax_disp.py
M /branches/relax_disp/test_suite/system_tests/scripts/relax_disp_cpmg_fast.py
Corrected remaining frq instances to cpmg_frq when appropriate to avoid confusion and corrected a
few related things in the system test script.
.....