The commands used were:
svn merge -r8685:8686 svn+ssh://bugman@.../svn/relax/branches/relax_disp/specific_fns/@r18123 specific_analyses
svn merge -r8685:8686 svn+ssh://bugman@.../svn/relax/branches/relax_disp/test_suite/@r18123 test_suite
The changes to the prompt package were manually ported to the user_functions package.
.....
r8686 | semor | 2009-01-27 22:47:00 +0100 (Tue, 27 Jan 2009) | 5 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/unit_tests/_prompt/test_relax_disp.py
Added more unit tests and tried to debug what was uncovered by these tests.
Still more work is needed for debugging...
.....