The commands used were:
svn merge -r8702:8703 svn+ssh://bugman@.../svn/relax/branches/relax_disp/generic_fns/@r18123 pipe_control
svn merge -r8702:8703 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.
.....
r8703 | semor | 2009-01-29 20:28:48 +0100 (Thu, 29 Jan 2009) | 3 lines
Changed paths:
M /branches/relax_disp/generic_fns/relax_data.py
M /branches/relax_disp/prompt/relax_data.py
M /branches/relax_disp/test_suite/system_tests/relax_disp.py
Updated a few dosctrings and tried to improve the system test.
.....
