Author: semor Date: Tue Dec 18 03:41:18 2007 New Revision: 4203 URL: http://svn.gna.org/viewcvs/relax?rev=4203&view=rev Log: Reverting the r4200 changes so the consistency-tests can be cleanly merged in the main 1.2 line. The command used was: svn merge -r4200:4199 . This is due to a beginner mistake by Sebastien Morin pointed out in the post by Edward d'Auvergne: https://mail.gna.org/public/relax-devel/2007-12/msg00015.html (Message-id: <7f080ed10712171508w44f86ee9s813793c246832aeb@xxxxxxxxxxxxxx> The main 1.2 line will now be ready for merging back the consistency-tests branch in it... Removed: 1.2/maths_fns/consistency_tests.py 1.2/prompt/consistency_tests.py 1.2/sample_scripts/consistency_tests.py 1.2/specific_fns/consistency_tests.py 1.2/test_suite/consistency_tests.py Modified: 1.2/generic_fns/runs.py 1.2/prompt/__init__.py 1.2/prompt/grace.py 1.2/prompt/interpreter.py 1.2/prompt/molmol.py 1.2/prompt/run.py 1.2/prompt/value.py 1.2/specific_fns/__init__.py 1.2/specific_fns/main.py 1.2/specific_fns/specific_setup.py 1.2/test_suite/__init__.py 1.2/test_suite/test_suite.py [This mail would be too long, it was shortened to contain the URLs only.] Modified: 1.2/generic_fns/runs.py URL: http://svn.gna.org/viewcvs/relax/1.2/generic_fns/runs.py?rev=4203&r1=4202&r2=4203&view=diff Removed: 1.2/maths_fns/consistency_tests.py URL: http://svn.gna.org/viewcvs/relax/1.2/maths_fns/consistency_tests.py?rev=4202&view=auto Modified: 1.2/prompt/__init__.py URL: http://svn.gna.org/viewcvs/relax/1.2/prompt/__init__.py?rev=4203&r1=4202&r2=4203&view=diff Removed: 1.2/prompt/consistency_tests.py URL: http://svn.gna.org/viewcvs/relax/1.2/prompt/consistency_tests.py?rev=4202&view=auto Modified: 1.2/prompt/grace.py URL: http://svn.gna.org/viewcvs/relax/1.2/prompt/grace.py?rev=4203&r1=4202&r2=4203&view=diff Modified: 1.2/prompt/interpreter.py URL: http://svn.gna.org/viewcvs/relax/1.2/prompt/interpreter.py?rev=4203&r1=4202&r2=4203&view=diff Modified: 1.2/prompt/molmol.py URL: http://svn.gna.org/viewcvs/relax/1.2/prompt/molmol.py?rev=4203&r1=4202&r2=4203&view=diff Modified: 1.2/prompt/run.py URL: http://svn.gna.org/viewcvs/relax/1.2/prompt/run.py?rev=4203&r1=4202&r2=4203&view=diff Modified: 1.2/prompt/value.py URL: http://svn.gna.org/viewcvs/relax/1.2/prompt/value.py?rev=4203&r1=4202&r2=4203&view=diff Removed: 1.2/sample_scripts/consistency_tests.py URL: http://svn.gna.org/viewcvs/relax/1.2/sample_scripts/consistency_tests.py?rev=4202&view=auto Modified: 1.2/specific_fns/__init__.py URL: http://svn.gna.org/viewcvs/relax/1.2/specific_fns/__init__.py?rev=4203&r1=4202&r2=4203&view=diff Removed: 1.2/specific_fns/consistency_tests.py URL: http://svn.gna.org/viewcvs/relax/1.2/specific_fns/consistency_tests.py?rev=4202&view=auto Modified: 1.2/specific_fns/main.py URL: http://svn.gna.org/viewcvs/relax/1.2/specific_fns/main.py?rev=4203&r1=4202&r2=4203&view=diff Modified: 1.2/specific_fns/specific_setup.py URL: http://svn.gna.org/viewcvs/relax/1.2/specific_fns/specific_setup.py?rev=4203&r1=4202&r2=4203&view=diff Modified: 1.2/test_suite/__init__.py URL: http://svn.gna.org/viewcvs/relax/1.2/test_suite/__init__.py?rev=4203&r1=4202&r2=4203&view=diff Removed: 1.2/test_suite/consistency_tests.py URL: http://svn.gna.org/viewcvs/relax/1.2/test_suite/consistency_tests.py?rev=4202&view=auto Modified: 1.2/test_suite/test_suite.py URL: http://svn.gna.org/viewcvs/relax/1.2/test_suite/test_suite.py?rev=4203&r1=4202&r2=4203&view=diff