The commands used were:
svn merge -r15130:15131 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15131:15132 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15132:15133 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15133:15134 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15134:15135 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15135:15136 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15136:15137 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15137:15138 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15138:15139 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15139:15140 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
The console messages were:
[edau@... relax-trunk]$ svn merge -r15130:15131 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
Conflict discovered in 'test_suite/system_tests/align_tensor.py'.
Select: (p) postpone, (df) diff-full, (e) edit,
(mc) mine-conflict, (tc) theirs-conflict,
(s) show all options: p
--- Merging r15131 into '.':
C test_suite/system_tests/align_tensor.py
Summary of conflicts:
Text conflicts: 1
[edau@... relax-trunk]$ svn merge -r15131:15132 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r15132 into '.':
U generic_fns/structure/mass.py
[edau@... relax-trunk]$ svn merge -r15132:15133 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
Conflict discovered in 'test_suite/unit_tests/_generic_fns/_structure/test_scientific.py'.
Select: (p) postpone, (df) diff-full, (e) edit,
(mc) mine-conflict, (tc) theirs-conflict,
(s) show all options: p
--- Merging r15133 into '.':
C test_suite/unit_tests/_generic_fns/_structure/test_scientific.py
Summary of conflicts:
Text conflicts: 1
[edau@... relax-trunk]$ svn merge -r15133:15134 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 r15134 into '.':
C generic_fns/structure/internal.py
U generic_fns/structure/scientific.py
Conflict discovered in 'generic_fns/structure/api_base.py'.
Select: (p) postpone, (df) diff-full, (e) edit,
(mc) mine-conflict, (tc) theirs-conflict,
(s) show all options: p
C generic_fns/structure/api_base.py
Summary of conflicts:
Text conflicts: 2
[edau@... relax-trunk]$ svn merge -r15134:15135 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 r15135 into '.':
C generic_fns/structure/main.py
Summary of conflicts:
Text conflicts: 1
[edau@... relax-trunk]$ svn merge -r15135:15136 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r15136 into '.':
G generic_fns/structure/main.py
[edau@... relax-trunk]$ svn merge -r15136:15137 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
Conflict discovered in 'specific_fns/n_state_model.py'.
Select: (p) postpone, (df) diff-full, (e) edit,
(mc) mine-conflict, (tc) theirs-conflict,
(s) show all options: p
--- Merging r15137 into '.':
C specific_fns/n_state_model.py
Summary of conflicts:
Text conflicts: 1
[edau@... relax-trunk]$ svn merge -r15137:15138 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
Conflict discovered in 'specific_fns/n_state_model.py'.
Select: (p) postpone, (df) diff-full, (e) edit,
(mc) mine-conflict, (tc) theirs-conflict,
(s) show all options: p
--- Merging r15138 into '.':
C specific_fns/n_state_model.py
Summary of conflicts:
Text conflicts: 1
[edau@... relax-trunk]$ svn merge -r15138:15139 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
Conflict discovered in 'specific_fns/n_state_model.py'.
Select: (p) postpone, (df) diff-full, (e) edit,
(mc) mine-conflict, (tc) theirs-conflict,
(s) show all options: p
--- Merging r15139 into '.':
C specific_fns/n_state_model.py
Summary of conflicts:
Text conflicts: 1
[edau@... relax-trunk]$ svn merge -r15139:15140 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r15140 into '.':
C prompt/align_tensor.py
Summary of conflicts:
Tree conflicts: 1
[edau@... relax-trunk]$
