The command used was:
svn merge -r8389:8390 svn+ssh://bugman@.../svn/relax/branches/relax_disp@r18123 .
.....
r8390 | semor | 2009-01-11 18:37:42 +0100 (Sun, 11 Jan 2009) | 7 lines
Changed paths:
A /branches/relax_disp/test_suite/shared_data/curve_fitting_disp/dataset_1-b
A /branches/relax_disp/test_suite/shared_data/curve_fitting_disp/dataset_1-b/readme (from /branches/relax_disp/test_suite/shared_data/curve_fitting_disp/dataset_1-a/readme:
8389)
Created a directory for the data recorded at 800 MHz and put a readme file explaining its origin.
The readme file was copied using the command:
svn cp test_suite/shared_data/curve_fitting_disp/dataset_1-a/readme test_suite/shared_data/curve_fitting_disp/dataset_1-b/readme
and was subsequently modified.
.....
