The commands used were:
svn merge -r15110:15111 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15111:15112 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15112:15113 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15113:15114 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15114:15115 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15115:15116 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15116:15117 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15117:15118 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15118:15119 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15119:15120 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
The console messages were:
[edau@... relax-trunk]$ svn merge -r15110:15111 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r15111 into '.':
U maths_fns/frame_order.py
[edau@... relax-trunk]$ svn merge -r15111:15112 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 r15112 into '.':
C specific_fns/frame_order.py
Summary of conflicts:
Text conflicts: 1
[edau@... relax-trunk]$ svn merge -r15112:15113 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r15113 into '.':
U generic_fns/pymol_control.py
[edau@... relax-trunk]$ svn merge -r15113:15114 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 r15114 into '.':
C specific_fns/frame_order.py
Summary of conflicts:
Text conflicts: 1
[edau@... relax-trunk]$ svn merge -r15114:15115 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r15115 into '.':
U test_suite/shared_data/frame_order/pseudo_ellipse/frame_order.bz2
U test_suite/shared_data/frame_order/pseudo_ellipse/cone.pdb
U test_suite/shared_data/frame_order/pseudo_ellipse/ave_pos.pdb
U test_suite/shared_data/frame_order/pseudo_ellipse/frame_order.log.bz2
U test_suite/shared_data/frame_order/pseudo_ellipse/frame_order.py
[edau@... relax-trunk]$ svn merge -r15115:15116 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r15116 into '.':
U test_suite/shared_data/frame_order/pseudo_ellipse/tensors.py
U test_suite/shared_data/frame_order/pseudo_ellipse/tensor_fit.log.bz2
[edau@... relax-trunk]$ svn merge -r15116:15117 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
Conflict discovered in 'generic_fns/structure/internal.py'.
Select: (p) postpone, (df) diff-full, (e) edit,
(mc) mine-conflict, (tc) theirs-conflict,
(s) show all options: p
--- Merging r15117 into '.':
C generic_fns/structure/internal.py
Summary of conflicts:
Text conflicts: 1
[edau@... relax-trunk]$ svn merge -r15117:15118 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
Conflict discovered in 'generic_fns/structure/main.py'.
Select: (p) postpone, (df) diff-full, (e) edit,
(mc) mine-conflict, (tc) theirs-conflict,
(s) show all options: p
--- Merging r15118 into '.':
C generic_fns/structure/main.py
Summary of conflicts:
Text conflicts: 1
[edau@... relax-trunk]$ svn merge -r15118:15119 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r15119 into '.':
G generic_fns/structure/internal.py
[edau@... relax-trunk]$ svn merge -r15119:15120 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
Conflict discovered in 'prompt/__init__.py'.
Select: (p) postpone, (df) diff-full, (e) edit,
(mc) mine-conflict, (tc) theirs-conflict,
(s) show all options: p
--- Merging r15120 into '.':
C prompt/__init__.py
U auto_analyses/__init__.py
Summary of conflicts:
Text conflicts: 1
[edau@... relax-trunk]$
