The commands used were:
svn merge -r17990:17991 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r17991:17992 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r17992:17993 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r17995:17996 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
The console messages were:
[edau@... relax-trunk]$ svn merge -r17990:17991 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r17991 into '.':
U specific_fns/frame_order.py
[edau@... relax-trunk]$ svn merge -r17991:17992 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r17992 into '.':
G specific_fns/frame_order.py
[edau@... relax-trunk]$ svn merge -r17992:17993 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r17993 into '.':
G specific_fns/frame_order.py
[edau@... relax-trunk]$ svn merge -r17995:17996 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r17996 into '.':
U auto_analyses/frame_order.py
[edau@... relax-trunk]$
