The commands used were:
svn merge -r18106:18107 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r18119:18120 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r18134:18135 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r18138:18139 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r18154:18155 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r18155:18156 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r18156:18157 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r18157:18158 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r18158:18159 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
The console messages were:
[edau@... relax-trunk]$ svn merge -r18106:18107 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r18107 into '.':
U generic_fns/align_tensor.py
[edau@... relax-trunk]$ svn merge -r18119:18120 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r18120 into '.':
G generic_fns/align_tensor.py
[edau@... relax-trunk]$ svn merge -r18134:18135 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r18135 into '.':
U test_suite/system_tests/scripts/n_state_model/paramag_align_fit.py
[edau@... relax-trunk]$ svn merge -r18138:18139 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r18139 into '.':
A test_suite/system_tests/scripts/n_state_model/frame_order_align_fit.py
U test_suite/system_tests/n_state_model.py
[edau@... relax-trunk]$ svn merge -r18154:18155 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r18155 into '.':
U test_suite/system_tests/selection.py
[edau@... relax-trunk]$ svn merge -r18155:18156 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r18156 into '.':
U relax_errors.py
[edau@... relax-trunk]$ svn merge -r18156:18157 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r18157 into '.':
U generic_fns/domain.py
[edau@... relax-trunk]$ svn merge -r18157:18158 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r18158 into '.':
G test_suite/system_tests/selection.py
[edau@... relax-trunk]$ svn merge -r18158:18159 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
Conflict discovered in 'generic_fns/selection.py'.
Select: (p) postpone, (df) diff-full, (e) edit,
(mc) mine-conflict, (tc) theirs-conflict,
(s) show all options: p
--- Merging r18159 into '.':
C generic_fns/selection.py
U user_functions/select.py
Summary of conflicts:
Text conflicts: 1
[edau@... relax-trunk]$
