The commands used were:
svn merge -r15070:15071 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15071:15072 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15072:15073 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15073:15074 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15074:15075 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15075:15076 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15076:15077 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15077:15078 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15078:15079 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15079:15080 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
The console messages were:
[edau@... relax-trunk]$ svn merge -r15070:15071 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r15071 into '.':
U specific_fns/frame_order.py
[edau@... relax-trunk]$ svn merge -r15071:15072 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r15072 into '.':
U maths_fns/frame_order.py
[edau@... relax-trunk]$ svn merge -r15072:15073 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r15073 into '.':
U test_suite/shared_data/frame_order/rotor2/frame_order.py
[edau@... relax-trunk]$ svn merge -r15073:15074 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r15074 into '.':
G specific_fns/frame_order.py
[edau@... relax-trunk]$ svn merge -r15074:15075 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r15075 into '.':
G maths_fns/frame_order.py
[edau@... relax-trunk]$ svn merge -r15075:15076 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
Conflict discovered in 'specific_fns/frame_order.py'.
Select: (p) postpone, (df) diff-full, (e) edit,
(mc) mine-conflict, (tc) theirs-conflict,
(s) show all options: p
--- Merging r15076 into '.':
C specific_fns/frame_order.py
Summary of conflicts:
Text conflicts: 1
[edau@... relax-trunk]$ svn merge -r15076:15077 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r15077 into '.':
G specific_fns/frame_order.py
[edau@... relax-trunk]$ svn merge -r15077:15078 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r15078 into '.':
G specific_fns/frame_order.py
[edau@... relax-trunk]$ svn merge -r15078:15079 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r15079 into '.':
G specific_fns/frame_order.py
[edau@... relax-trunk]$ svn merge -r15079:15080 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r15080 into '.':
U test_suite/shared_data/frame_order/rigid/frame_order.bz2
U test_suite/shared_data/frame_order/rigid/ave_pos.pdb
A test_suite/shared_data/frame_order/rigid/frame_order.log.bz2
U test_suite/shared_data/frame_order/rigid/frame_order.py
[edau@... relax-trunk]$
