The commands used were:
svn merge -r15120:15121 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15121:15122 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15122:15123 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15123:15124 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15124:15125 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15125:15126 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15126:15127 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15127:15128 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15128:15129 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15129:15130 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
The console messages were:
[edau@... relax-trunk]$ svn merge -r15120:15121 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
Conflict discovered in 'generic_fns/structure/scientific.py'.
Select: (p) postpone, (df) diff-full, (e) edit,
(mc) mine-conflict, (tc) theirs-conflict,
(s) show all options: p
--- Merging r15121 into '.':
C 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 -r15121:15122 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r15122 into '.':
U specific_fns/frame_order.py
[edau@... relax-trunk]$ svn merge -r15122:15123 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
Conflict discovered in 'generic_fns/align_tensor.py'.
Select: (p) postpone, (df) diff-full, (e) edit,
(mc) mine-conflict, (tc) theirs-conflict,
(s) show all options: p
--- Merging r15123 into '.':
C generic_fns/align_tensor.py
Summary of conflicts:
Text conflicts: 1
[edau@... relax-trunk]$ svn merge -r15123:15124 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
Conflict discovered in 'test_suite/unit_tests/_generic_fns/_structure/test_internal.py'.
Select: (p) postpone, (df) diff-full, (e) edit,
(mc) mine-conflict, (tc) theirs-conflict,
(s) show all options: p
--- Merging r15124 into '.':
C test_suite/unit_tests/_generic_fns/_structure/test_internal.py
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
C test_suite/unit_tests/_generic_fns/_structure/test_scientific.py
Summary of conflicts:
Text conflicts: 2
[edau@... relax-trunk]$ svn merge -r15124:15125 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 r15125 into '.':
C generic_fns/structure/main.py
Summary of conflicts:
Text conflicts: 1
[edau@... relax-trunk]$ svn merge -r15125:15126 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r15126 into '.':
G generic_fns/align_tensor.py
[edau@... relax-trunk]$ svn merge -r15126:15127 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r15127 into '.':
G test_suite/unit_tests/_generic_fns/_structure/test_internal.py
[edau@... relax-trunk]$ svn merge -r15127:15128 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r15128 into '.':
U test_suite/unit_tests/_maths_fns/test_frame_order_matrix_ops.py
[edau@... relax-trunk]$ svn merge -r15128:15129 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
Conflict discovered in 'generic_fns/structure/scientific.py'.
Select: (p) postpone, (df) diff-full, (e) edit,
(mc) mine-conflict, (tc) theirs-conflict,
(s) show all options: p
--- Merging r15129 into '.':
C generic_fns/structure/scientific.py
Summary of conflicts:
Text conflicts: 1
[edau@... relax-trunk]$ svn merge -r15129:15130 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r15130 into '.':
U prompt/domain.py
[edau@... relax-trunk]$
