Author: bugman
Date: Fri Mar 22 17:05:42 2013
New Revision: 18990
URL: http://svn.gna.org/viewcvs/relax?rev=18990&view=rev
Log:
Next block of the manual merger of the frame_order_testing branch.
The commands used were:
svn merge -r18106:18107
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
svn merge -r18119:18120
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
svn merge -r18134:18135
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
svn merge -r18138:18139
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
svn merge -r18154:18155
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
svn merge -r18155:18156
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
svn merge -r18156:18157
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
svn merge -r18157:18158
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
svn merge -r18158:18159
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
The console messages were:
[edau@localhost relax-trunk]$ svn merge -r18106:18107
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
--- Merging r18107 into '.':
U generic_fns/align_tensor.py
[edau@localhost relax-trunk]$ svn merge -r18119:18120
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
--- Merging r18120 into '.':
G generic_fns/align_tensor.py
[edau@localhost relax-trunk]$ svn merge -r18134:18135
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
--- Merging r18135 into '.':
U test_suite/system_tests/scripts/n_state_model/paramag_align_fit.py
[edau@localhost relax-trunk]$ svn merge -r18138:18139
svn+ssh://bugman@xxxxxxxxxxx/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@localhost relax-trunk]$ svn merge -r18154:18155
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
--- Merging r18155 into '.':
U test_suite/system_tests/selection.py
[edau@localhost relax-trunk]$ svn merge -r18155:18156
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
--- Merging r18156 into '.':
U relax_errors.py
[edau@localhost relax-trunk]$ svn merge -r18156:18157
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
--- Merging r18157 into '.':
U generic_fns/domain.py
[edau@localhost relax-trunk]$ svn merge -r18157:18158
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
--- Merging r18158 into '.':
G test_suite/system_tests/selection.py
[edau@localhost relax-trunk]$ svn merge -r18158:18159
svn+ssh://bugman@xxxxxxxxxxx/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@localhost relax-trunk]$
Added:
trunk/test_suite/system_tests/scripts/n_state_model/frame_order_align_fit.py
- copied unchanged from r18139,
branches/frame_order_testing/test_suite/system_tests/scripts/n_state_model/frame_order_align_fit.py
Modified:
trunk/generic_fns/align_tensor.py
trunk/generic_fns/domain.py
trunk/generic_fns/selection.py
trunk/relax_errors.py
trunk/test_suite/system_tests/n_state_model.py
trunk/test_suite/system_tests/scripts/n_state_model/paramag_align_fit.py
trunk/test_suite/system_tests/selection.py
trunk/user_functions/select.py
[This mail would be too long, it was shortened to contain the URLs only.]
Modified: trunk/generic_fns/align_tensor.py
URL:
http://svn.gna.org/viewcvs/relax/trunk/generic_fns/align_tensor.py?rev=18990&r1=18989&r2=18990&view=diff
Modified: trunk/generic_fns/domain.py
URL:
http://svn.gna.org/viewcvs/relax/trunk/generic_fns/domain.py?rev=18990&r1=18989&r2=18990&view=diff
Modified: trunk/generic_fns/selection.py
URL:
http://svn.gna.org/viewcvs/relax/trunk/generic_fns/selection.py?rev=18990&r1=18989&r2=18990&view=diff
Modified: trunk/relax_errors.py
URL:
http://svn.gna.org/viewcvs/relax/trunk/relax_errors.py?rev=18990&r1=18989&r2=18990&view=diff
Modified: trunk/test_suite/system_tests/n_state_model.py
URL:
http://svn.gna.org/viewcvs/relax/trunk/test_suite/system_tests/n_state_model.py?rev=18990&r1=18989&r2=18990&view=diff
Modified:
trunk/test_suite/system_tests/scripts/n_state_model/paramag_align_fit.py
URL:
http://svn.gna.org/viewcvs/relax/trunk/test_suite/system_tests/scripts/n_state_model/paramag_align_fit.py?rev=18990&r1=18989&r2=18990&view=diff
Modified: trunk/test_suite/system_tests/selection.py
URL:
http://svn.gna.org/viewcvs/relax/trunk/test_suite/system_tests/selection.py?rev=18990&r1=18989&r2=18990&view=diff
Modified: trunk/user_functions/select.py
URL:
http://svn.gna.org/viewcvs/relax/trunk/user_functions/select.py?rev=18990&r1=18989&r2=18990&view=diff
r18990 - in /trunk: ./ generic_fns/ test_suite/system_tests/ test_suite/system_tests/scripts/n_state_model/ user_functions/