Menu

SVN archive Commit Log


Commit Date  
[r19012] by bugman

Deletion of a debugging printout statement.

2013-03-22 21:05:57 Tree
[r19011] by bugman

Renamed the relax_warnings module to lib.warnings.

This is part of the relax library redesign.

2013-03-22 20:58:13 Tree
[r19010] by bugman

Rearrangements for the unit tests of the old relax_io module (now lib.io).

2013-03-22 20:53:55 Tree
[r19009] by bugman

Renamed the relax_io module to lib.io.

This is part of the relax library redesign.

2013-03-22 20:51:55 Tree
[r19008] by bugman

Renamed the relax_string module to lib.text.string.

This is part of the relax library redesign.

2013-03-22 20:44:59 Tree
[r19007] by bugman

Renamed the relax_errors module to lib.errors.

This is part of the relax library redesign.

2013-03-22 20:41:29 Tree
[r19006] by bugman

Deletion of the frame_order_testing branch - this code has now been manually merged into trunk.

2013-03-22 16:52:59 Tree
[r19005] by bugman

Added the script used to recover the frame_order_testing branch to the devel_scripts directory.

This might be useful at some point in the future.

2013-03-22 16:51:16 Tree
[r19004] by bugman

Final synchronisation of all the frame_order_testing branch files back to trunk for the merger.

The manual merger of the frame_order_testing branch did not bring over all changes for some reason.
Maybe this was due to bad conflict resolution. The changes not merged back were found with the
command:

$ diff -qr . ../../relax-trunk | grep -v ".svn"

This was run from the checked out branch. All the differing files were then copied over manually.

2013-03-22 16:49:23 Tree
[r19003] by bugman

Next block of the manual merger of the frame_order_testing branch.

The commands used were:
svn merge -r18892:18893 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r18916:18917 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r18917:18918 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r18920:18921 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r18921:18922 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r18933:18934 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r18934:18935 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r18935:18936 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .

The console messages were:
[edau@... relax-trunk]$ svn merge -r18892:18893 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r18893 into '.':
U specific_fns/frame_order.py
[edau@... relax-trunk]$ svn merge -r18916:18917 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
[edau@... relax-trunk]$ svn merge -r18917:18918 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r18918 into '.':
G specific_fns/frame_order.py
U auto_analyses/frame_order.py
[edau@... relax-trunk]$ svn merge -r18920:18921 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r18921 into '.':
G specific_fns/frame_order.py
[edau@... relax-trunk]$ svn merge -r18921:18922 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r18922 into '.':
G auto_analyses/frame_order.py
[edau@... relax-trunk]$ svn merge -r18933:18934 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r18934 into '.':
G specific_fns/frame_order.py
[edau@... relax-trunk]$ svn merge -r18934:18935 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r18935 into '.':
U test_suite/system_tests/scripts/frame_order/rigid_test.py
[edau@... relax-trunk]$ svn merge -r18935:18936 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r18936 into '.':
G specific_fns/frame_order.py
[edau@... relax-trunk]$

2013-03-22 16:35:56 Tree
Older >
Want the latest updates on software, tech news, and AI?
Get latest updates about software, tech news, and AI from SourceForge directly in your inbox once a month.