The commands used were:
svn merge -r18240:18241 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r18387:18388 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r18430:18431 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r18432:18433 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r18433:18434 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r18435:18436 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r18438:18439 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r18439:18440 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
The console messages were:
[edau@... relax-trunk]$ svn merge -r18240:18241 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r18241 into '.':
U test_suite/system_tests/n_state_model.py
[edau@... relax-trunk]$ svn merge -r18387:18388 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r18388 into '.':
U scons/manuals.py
[edau@... relax-trunk]$ svn merge -r18430:18431 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r18431 into '.':
U auto_analyses/frame_order.py
[edau@... relax-trunk]$ svn merge -r18432:18433 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r18433 into '.':
A test_suite/shared_data/frame_order/cam/free_rotor_missing_data
A test_suite/shared_data/frame_order/cam/free_rotor_missing_data/generate_distribution.py
A test_suite/shared_data/frame_order/cam/free_rotor_missing_data/frame_order.bz2
A test_suite/shared_data/frame_order/cam/free_rotor_missing_data/rdc_dy.txt
A test_suite/shared_data/frame_order/cam/free_rotor_missing_data/clean
A test_suite/shared_data/frame_order/cam/free_rotor_missing_data/tensors.py
A test_suite/shared_data/frame_order/cam/free_rotor_missing_data/pcs_dy_subset.txt
A test_suite/shared_data/frame_order/cam/free_rotor_missing_data/rdc_tm.txt
A test_suite/shared_data/frame_order/cam/free_rotor_missing_data/tensor_fit.log.bz2
A test_suite/shared_data/frame_order/cam/free_rotor_missing_data/pcs_tb.txt
A test_suite/shared_data/frame_order/cam/free_rotor_missing_data/cone.pdb
A test_suite/shared_data/frame_order/cam/free_rotor_missing_data/pcs_er.txt
A test_suite/shared_data/frame_order/cam/free_rotor_missing_data/full_analysis.py
A test_suite/shared_data/frame_order/cam/free_rotor_missing_data/pcs_dy.txt
A test_suite/shared_data/frame_order/cam/free_rotor_missing_data/ave_pos.pdb
A test_suite/shared_data/frame_order/cam/free_rotor_missing_data/subset_pcs.py
A test_suite/shared_data/frame_order/cam/free_rotor_missing_data/frame_order.log.bz2
A test_suite/shared_data/frame_order/cam/free_rotor_missing_data/distribution.pdb.gz
A test_suite/shared_data/frame_order/cam/free_rotor_missing_data/tensor_fit.py
A test_suite/shared_data/frame_order/cam/free_rotor_missing_data/generate_distribution.log.bz2
A test_suite/shared_data/frame_order/cam/free_rotor_missing_data/animate.py
A test_suite/shared_data/frame_order/cam/free_rotor_missing_data/axis_system
A test_suite/shared_data/frame_order/cam/free_rotor_missing_data/frame_order_matrix
A test_suite/shared_data/frame_order/cam/free_rotor_missing_data/rdc_tb.txt
A test_suite/shared_data/frame_order/cam/free_rotor_missing_data/frame_order.py
A test_suite/shared_data/frame_order/cam/free_rotor_missing_data/pcs_tb_subset.txt
A test_suite/shared_data/frame_order/cam/free_rotor_missing_data/back_calc.bz2
A test_suite/shared_data/frame_order/cam/free_rotor_missing_data/pcs_er_subset.txt
A test_suite/system_tests/scripts/frame_order/cam/free_rotor_missing_data.py
Conflict discovered in 'test_suite/system_tests/scripts/frame_order/cam/base_script.py'.
Select: (p) postpone, (df) diff-full, (e) edit,
(mc) mine-conflict, (tc) theirs-conflict,
(s) show all options: p
C test_suite/system_tests/scripts/frame_order/cam/base_script.py
U test_suite/system_tests/frame_order.py
Summary of conflicts:
Text conflicts: 1
[edau@... relax-trunk]$ svn merge -r18433:18434 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
Conflict discovered in 'test_suite/system_tests/scripts/frame_order/cam/base_script.py'.
Select: (p) postpone, (df) diff-full, (e) edit,
(mc) mine-conflict, (tc) theirs-conflict,
(s) show all options: p
--- Merging r18434 into '.':
C test_suite/system_tests/scripts/frame_order/cam/base_script.py
Summary of conflicts:
Text conflicts: 1
[edau@... relax-trunk]$ svn merge -r18435:18436 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r18436 into '.':
U specific_fns/frame_order.py
[edau@... relax-trunk]$ svn merge -r18438:18439 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r18439 into '.':
G test_suite/system_tests/frame_order.py
[edau@... relax-trunk]$ svn merge -r18439:18440 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r18440 into '.':
G specific_fns/frame_order.py
[edau@... relax-trunk]$
