The command used was:
svn merge -r3286:3287 svn+ssh://bugman@.../svn/relax/1.2
.....
r3287 | bugman | 2007-05-08 23:39:21 +0200 (Tue, 08 May 2007) | 9 lines
Changed paths:
M /1.2/sample_scripts/full_analysis.py
Improvements to the 'full_analysis.py' sample script.
The script's documentation has been shifted from the __init__() method docstring to the module
docstring.
All of the options which need to be modified by the user have been shifted to the top of the script
as global variables. This means that the user doesn't even need to look at the complex code to
operate the script.
.....