r2903 - in /branches/test_suite: ./ data/ generic_fns/ prompt/ test_suite/system_tests/data/curve_fitting/ test_suite/system...r2903 - in /branches/test_suite: ./ data/ generic_fns/ prompt/ test_suite/system_tests/data/curve_fitting/ test_suite/system...Author: bugman Date: Sat Dec 2 05:47:05 2006 New Revision: 2903 URL: http://svn.gna.org/viewcvs/relax?rev=2903&view=rev Log: Ported r2847, the merger of the 'tensor_pdb' branch, from the 1.3 line. The commands used were: svn merge -r2846:2847 svn+ssh://bugman@xxxxxxxxxxx/svn/relax/1.3 svn merge -r2846:2847 svn+ssh://bugman@xxxxxxxxxxx/svn/relax/1.3/test_suite/ test_suite/system_tests The second command fixes the problem of the rearrangement of the test suite file layout. Added: branches/test_suite/data/ - copied from r2847, 1.3/data/ branches/test_suite/generic_fns/pymol.py - copied unchanged from r2847, 1.3/generic_fns/pymol.py branches/test_suite/prompt/pymol.py - copied unchanged from r2847, 1.3/prompt/pymol.py Removed: branches/test_suite/data.py Modified: branches/test_suite/errors.py branches/test_suite/generic_fns/diffusion_tensor.py branches/test_suite/generic_fns/main.py branches/test_suite/generic_fns/molmol.py branches/test_suite/generic_fns/pdb.py branches/test_suite/prompt/__init__.py branches/test_suite/prompt/init_data.py branches/test_suite/prompt/interpreter.py branches/test_suite/prompt/molmol.py branches/test_suite/prompt/pdb.py branches/test_suite/relax branches/test_suite/test_suite/system_tests/data/curve_fitting/rx.save.bz2 branches/test_suite/test_suite/system_tests/data/model_free/orig_state.bz2 branches/test_suite/thread_classes.py [This mail would be too long, it was shortened to contain the URLs only.] Modified: branches/test_suite/errors.py URL: http://svn.gna.org/viewcvs/relax/branches/test_suite/errors.py?rev=2903&r1=2902&r2=2903&view=diff Modified: branches/test_suite/generic_fns/diffusion_tensor.py URL: http://svn.gna.org/viewcvs/relax/branches/test_suite/generic_fns/diffusion_tensor.py?rev=2903&r1=2902&r2=2903&view=diff Modified: branches/test_suite/generic_fns/main.py URL: http://svn.gna.org/viewcvs/relax/branches/test_suite/generic_fns/main.py?rev=2903&r1=2902&r2=2903&view=diff Modified: branches/test_suite/generic_fns/molmol.py URL: http://svn.gna.org/viewcvs/relax/branches/test_suite/generic_fns/molmol.py?rev=2903&r1=2902&r2=2903&view=diff Modified: branches/test_suite/generic_fns/pdb.py URL: http://svn.gna.org/viewcvs/relax/branches/test_suite/generic_fns/pdb.py?rev=2903&r1=2902&r2=2903&view=diff Modified: branches/test_suite/prompt/__init__.py URL: http://svn.gna.org/viewcvs/relax/branches/test_suite/prompt/__init__.py?rev=2903&r1=2902&r2=2903&view=diff Modified: branches/test_suite/prompt/init_data.py URL: http://svn.gna.org/viewcvs/relax/branches/test_suite/prompt/init_data.py?rev=2903&r1=2902&r2=2903&view=diff Modified: branches/test_suite/prompt/interpreter.py URL: http://svn.gna.org/viewcvs/relax/branches/test_suite/prompt/interpreter.py?rev=2903&r1=2902&r2=2903&view=diff Modified: branches/test_suite/prompt/molmol.py URL: http://svn.gna.org/viewcvs/relax/branches/test_suite/prompt/molmol.py?rev=2903&r1=2902&r2=2903&view=diff Modified: branches/test_suite/prompt/pdb.py URL: http://svn.gna.org/viewcvs/relax/branches/test_suite/prompt/pdb.py?rev=2903&r1=2902&r2=2903&view=diff Modified: branches/test_suite/relax URL: http://svn.gna.org/viewcvs/relax/branches/test_suite/relax?rev=2903&r1=2902&r2=2903&view=diff Modified: branches/test_suite/test_suite/system_tests/data/curve_fitting/rx.save.bz2 URL: http://svn.gna.org/viewcvs/relax/branches/test_suite/test_suite/system_tests/data/curve_fitting/rx.save.bz2?rev=2903&r1=2902&r2=2903&view=diff Modified: branches/test_suite/test_suite/system_tests/data/model_free/orig_state.bz2 URL: http://svn.gna.org/viewcvs/relax/branches/test_suite/test_suite/system_tests/data/model_free/orig_state.bz2?rev=2903&r1=2902&r2=2903&view=diff Modified: branches/test_suite/thread_classes.py URL: http://svn.gna.org/viewcvs/relax/branches/test_suite/thread_classes.py?rev=2903&r1=2902&r2=2903&view=diff