The commands used were:
[edward@... bieri_gui]$ svn merge -r10993:10992 .
--- Reverse-merging r10993 into '.':
U auto_analyses/relax_fit.py
[edward@... bieri_gui]$ svn merge -r10960:10959 .
--- Reverse-merging r10960 into '.':
G auto_analyses/relax_fit.py
[edward@... bieri_gui]$ svn merge -r10936:10922 .
--- Reverse-merging r10936 through r10923 into '.':
G auto_analyses/relax_fit.py
This reverts, in reverse order: r10923 to r10936; r10960, the first attempt at reverting; and
r10993, the attempt at fixing the damage of r10960. The auto_analyses/relax_fit.py is now
identical to that of the 1.3 line, and the branch should be mergeable after the other modules of
auto_analyses have been reverted. This branch reparation still needs to be checked!
