Author: bugman
Date: Fri Mar 22 12:14:53 2013
New Revision: 18951
URL: http://svn.gna.org/viewcvs/relax?rev=18951&view=rev
Log:
Next block of the manual merger of the frame_order_testing branch.
The commands used were:
svn merge -r15110:15111
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
svn merge -r15111:15112
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
svn merge -r15112:15113
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
svn merge -r15113:15114
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
svn merge -r15114:15115
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
svn merge -r15115:15116
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
svn merge -r15116:15117
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
svn merge -r15117:15118
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
svn merge -r15118:15119
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
svn merge -r15119:15120
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
The console messages were:
[edau@localhost relax-trunk]$ svn merge -r15110:15111
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
--- Merging r15111 into '.':
U maths_fns/frame_order.py
[edau@localhost relax-trunk]$ svn merge -r15111:15112
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
Conflict discovered in 'specific_fns/frame_order.py'.
Select: (p) postpone, (df) diff-full, (e) edit,
(mc) mine-conflict, (tc) theirs-conflict,
(s) show all options: p
--- Merging r15112 into '.':
C specific_fns/frame_order.py
Summary of conflicts:
Text conflicts: 1
[edau@localhost relax-trunk]$ svn merge -r15112:15113
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
--- Merging r15113 into '.':
U generic_fns/pymol_control.py
[edau@localhost relax-trunk]$ svn merge -r15113:15114
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
Conflict discovered in 'specific_fns/frame_order.py'.
Select: (p) postpone, (df) diff-full, (e) edit,
(mc) mine-conflict, (tc) theirs-conflict,
(s) show all options: p
--- Merging r15114 into '.':
C specific_fns/frame_order.py
Summary of conflicts:
Text conflicts: 1
[edau@localhost relax-trunk]$ svn merge -r15114:15115
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
--- Merging r15115 into '.':
U test_suite/shared_data/frame_order/pseudo_ellipse/frame_order.bz2
U test_suite/shared_data/frame_order/pseudo_ellipse/cone.pdb
U test_suite/shared_data/frame_order/pseudo_ellipse/ave_pos.pdb
U test_suite/shared_data/frame_order/pseudo_ellipse/frame_order.log.bz2
U test_suite/shared_data/frame_order/pseudo_ellipse/frame_order.py
[edau@localhost relax-trunk]$ svn merge -r15115:15116
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
--- Merging r15116 into '.':
U test_suite/shared_data/frame_order/pseudo_ellipse/tensors.py
U test_suite/shared_data/frame_order/pseudo_ellipse/tensor_fit.log.bz2
[edau@localhost relax-trunk]$ svn merge -r15116:15117
svn+ssh://bugman@xxxxxxxxxxx/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 r15117 into '.':
C generic_fns/structure/internal.py
Summary of conflicts:
Text conflicts: 1
[edau@localhost relax-trunk]$ svn merge -r15117:15118
svn+ssh://bugman@xxxxxxxxxxx/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 r15118 into '.':
C generic_fns/structure/main.py
Summary of conflicts:
Text conflicts: 1
[edau@localhost relax-trunk]$ svn merge -r15118:15119
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
--- Merging r15119 into '.':
G generic_fns/structure/internal.py
[edau@localhost relax-trunk]$ svn merge -r15119:15120
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
Conflict discovered in 'prompt/__init__.py'.
Select: (p) postpone, (df) diff-full, (e) edit,
(mc) mine-conflict, (tc) theirs-conflict,
(s) show all options: p
--- Merging r15120 into '.':
C prompt/__init__.py
U auto_analyses/__init__.py
Summary of conflicts:
Text conflicts: 1
[edau@localhost relax-trunk]$
Modified:
trunk/auto_analyses/__init__.py
trunk/generic_fns/pymol_control.py
trunk/generic_fns/structure/internal.py
trunk/generic_fns/structure/main.py
trunk/maths_fns/frame_order.py
trunk/specific_fns/frame_order.py
trunk/test_suite/shared_data/frame_order/pseudo_ellipse/ave_pos.pdb
trunk/test_suite/shared_data/frame_order/pseudo_ellipse/cone.pdb
trunk/test_suite/shared_data/frame_order/pseudo_ellipse/frame_order.bz2
trunk/test_suite/shared_data/frame_order/pseudo_ellipse/frame_order.log.bz2
trunk/test_suite/shared_data/frame_order/pseudo_ellipse/frame_order.py
trunk/test_suite/shared_data/frame_order/pseudo_ellipse/tensor_fit.log.bz2
trunk/test_suite/shared_data/frame_order/pseudo_ellipse/tensors.py
[This mail would be too long, it was shortened to contain the URLs only.]
Modified: trunk/auto_analyses/__init__.py
URL:
http://svn.gna.org/viewcvs/relax/trunk/auto_analyses/__init__.py?rev=18951&r1=18950&r2=18951&view=diff
Modified: trunk/generic_fns/pymol_control.py
URL:
http://svn.gna.org/viewcvs/relax/trunk/generic_fns/pymol_control.py?rev=18951&r1=18950&r2=18951&view=diff
Modified: trunk/generic_fns/structure/internal.py
URL:
http://svn.gna.org/viewcvs/relax/trunk/generic_fns/structure/internal.py?rev=18951&r1=18950&r2=18951&view=diff
Modified: trunk/generic_fns/structure/main.py
URL:
http://svn.gna.org/viewcvs/relax/trunk/generic_fns/structure/main.py?rev=18951&r1=18950&r2=18951&view=diff
Modified: trunk/maths_fns/frame_order.py
URL:
http://svn.gna.org/viewcvs/relax/trunk/maths_fns/frame_order.py?rev=18951&r1=18950&r2=18951&view=diff
Modified: trunk/specific_fns/frame_order.py
URL:
http://svn.gna.org/viewcvs/relax/trunk/specific_fns/frame_order.py?rev=18951&r1=18950&r2=18951&view=diff
Modified: trunk/test_suite/shared_data/frame_order/pseudo_ellipse/ave_pos.pdb
URL:
http://svn.gna.org/viewcvs/relax/trunk/test_suite/shared_data/frame_order/pseudo_ellipse/ave_pos.pdb?rev=18951&r1=18950&r2=18951&view=diff
Modified: trunk/test_suite/shared_data/frame_order/pseudo_ellipse/cone.pdb
URL:
http://svn.gna.org/viewcvs/relax/trunk/test_suite/shared_data/frame_order/pseudo_ellipse/cone.pdb?rev=18951&r1=18950&r2=18951&view=diff
Modified:
trunk/test_suite/shared_data/frame_order/pseudo_ellipse/frame_order.bz2
URL:
http://svn.gna.org/viewcvs/relax/trunk/test_suite/shared_data/frame_order/pseudo_ellipse/frame_order.bz2?rev=18951&r1=18950&r2=18951&view=diff
Modified:
trunk/test_suite/shared_data/frame_order/pseudo_ellipse/frame_order.log.bz2
URL:
http://svn.gna.org/viewcvs/relax/trunk/test_suite/shared_data/frame_order/pseudo_ellipse/frame_order.log.bz2?rev=18951&r1=18950&r2=18951&view=diff
Modified:
trunk/test_suite/shared_data/frame_order/pseudo_ellipse/frame_order.py
URL:
http://svn.gna.org/viewcvs/relax/trunk/test_suite/shared_data/frame_order/pseudo_ellipse/frame_order.py?rev=18951&r1=18950&r2=18951&view=diff
Modified:
trunk/test_suite/shared_data/frame_order/pseudo_ellipse/tensor_fit.log.bz2
URL:
http://svn.gna.org/viewcvs/relax/trunk/test_suite/shared_data/frame_order/pseudo_ellipse/tensor_fit.log.bz2?rev=18951&r1=18950&r2=18951&view=diff
Modified: trunk/test_suite/shared_data/frame_order/pseudo_ellipse/tensors.py
URL:
http://svn.gna.org/viewcvs/relax/trunk/test_suite/shared_data/frame_order/pseudo_ellipse/tensors.py?rev=18951&r1=18950&r2=18951&view=diff
r18951 - in /trunk: auto_analyses/ generic_fns/ generic_fns/structure/ maths_fns/ specific_fns/ test_suite/shared_data/frame...