Hi Ed, I undeleted the consistency-tests branch and reverted the changes to the main 1.2 line. When I try to merge the consistency-tests branch to the main 1.2 line using : svn merge -r3320:4200 svn+ssh://semor@xxxxxxxxxxx/svn/relax/branches/consistency_tests_1.2/ I get the following output : U prompt/__init__.py U prompt/value.py U prompt/molmol.py U prompt/interpreter.py U prompt/run.py U prompt/grace.py svn: Copyfrom-url 'svn+ssh://semor@xxxxxxxxxxx/svn/relax/branches/consistency_tests_1.2/prompt/consistency_tests.py' has different repository root than 'svn+ssh://svn.gna.org/svn/relax' However, if I check the repository root of these file/directory, I get : svn info svn+ssh://semor@xxxxxxxxxxx/svn/relax/branches/consistency_tests_1.2/prompt/consistency_tests.py Path: consistency_tests.py Name: consistency_tests.py URL: svn+ssh://semor@xxxxxxxxxxx/svn/relax/branches/consistency_tests_1.2/prompt/consistency_tests.py Repository Root: svn+ssh://semor@xxxxxxxxxxx/svn/relax Repository UUID: b7916896-f9f9-0310-9fe5-b3996d8957d5 Revision: 4203 Node Kind: file Last Changed Author: bugman Last Changed Rev: 3341 Last Changed Date: 2007-07-15 10:12:00 -0400 (Sun, 15 Jul 2007) and svn info svn+ssh://semor@xxxxxxxxxxx/svn/relax/ Path: relax URL: svn+ssh://semor@xxxxxxxxxxx/svn/relax Repository Root: svn+ssh://semor@xxxxxxxxxxx/svn/relax Repository UUID: b7916896-f9f9-0310-9fe5-b3996d8957d5 Revision: 4203 Node Kind: directory Last Changed Author: semor Last Changed Rev: 4203 Last Changed Date: 2007-12-17 21:41:18 -0500 (Mon, 17 Dec 2007) Well, the repository roots seem the same... I don't really understand this error... I tried to see if there were changes that needed to be merged to the branch using svnmerge.py. There were 2 changes (4200 and 4203), which I merged. Then, I retried the same command (but changing 4200 with 4204) and got the same exact error message... I'll go have a sleep and have a fresh eye on it tomorrow ! Anyway, the repository is now as it was prior to my mistake... Cheers ! Séb :) Edward d'Auvergne wrote: Hi, There is a slight problem with this approach. The conflict was because of a reversion. r3532 was the last revision in which unique changes to the line occurred. However r4199 included many changes which should have been included when you merged the branch into the 1.2 line. By not including this revision, the merge has reverted (removed) all changes to the 1.2 line which has occurred since r3532. The merge must occur for the whole directory tree in one command. The conflict is a sign that there is a serious problem somewhere. There is no need to worry though, all changes in SVN can be reverted. I would first undelete the branch (revert r4201) and then undo the merger into the 1.2 line (revert r4200). The manual explains how to use the 'svn merge' command to do this. I would in the logs point to this post for the reasoning behind the reversion. It is best also to write the log when you commit rather than using a log file. Once these are fixed, I would then retry the branch merging process with the command: $ svn merge -r3320:4200 svn+ssh://semor@xxxxxxxxxxx/svn/relax/branches/consistency_tests_1.2/ This, if you are in a checked out copy of the 1.2 line, should work fine. If not then the problem could be that the 1.2 checked out copy is not up to date, or that svnmerge needs to be run on the branch again. If there is a conflict again, we will need to determine the problem prior to merging. Again, don't worry. Everything is revertable in SVN, even is someone decided to delete every last file in the repository. Regards, Edward On Dec 17, 2007 11:52 PM, Sebastien Morin <sebastien.morin.1@xxxxxxxxx> wrote:Hi Ed, The last number was 3532 since no change has occured in the branch since this revision... Also, the merges were made one directory at a time with the following commands (instead of just one single command) : svn merge -r3320:3532 svn+ssh://semor@xxxxxxxxxxx/svn/relax/branches/consistency_tests_1.2/prompt/ svn merge -r3320:3532 svn+ssh://semor@xxxxxxxxxxx/svn/relax/branches/consistency_tests_1.2/maths_fns/ svn merge -r3320:3532 svn+ssh://semor@xxxxxxxxxxx/svn/relax/branches/consistency_tests_1.2/generic_fns/ svn merge -r3320:3532 svn+ssh://semor@xxxxxxxxxxx/svn/relax/branches/consistency_tests_1.2/sample_scripts svn merge -r3320:3532 svn+ssh://semor@xxxxxxxxxxx/svn/relax/branches/consistency_tests_1.2/specific_fns svn merge -r3320:3532 svn+ssh://semor@xxxxxxxxxxx/svn/relax/branches/consistency_tests_1.2/test_suite I had to do things that way because the '.' directory was marked with the C flag and a file was created (dir_conflicts.prej) containing conflicts concerning blocked revisions from the 1.3 line. Thus, when merging directories one at a time instead of the base directory, things got fine and I could commit the main line without any error message telling me that my working copy was conflicting with the repository... For the log, I apologize, I was a bit confused with the changing of the branch and the final changing of the main line... Sorry about that. Beginners make errors... The log should go like : ================================ ... The commands used were: svn merge -r3320:3532 svn+ssh://semor@xxxxxxxxxxx/svn/relax/branches/consistency_tests_1.2/prompt/ svn merge -r3320:3532 svn+ssh://semor@xxxxxxxxxxx/svn/relax/branches/consistency_tests_1.2/maths_fns/ svn merge -r3320:3532 svn+ssh://semor@xxxxxxxxxxx/svn/relax/branches/consistency_tests_1.2/generic_fns/ svn merge -r3320:3532 svn+ssh://semor@xxxxxxxxxxx/svn/relax/branches/consistency_tests_1.2/sample_scripts svn merge -r3320:3532 svn+ssh://semor@xxxxxxxxxxx/svn/relax/branches/consistency_tests_1.2/specific_fns svn merge -r3320:3532 svn+ssh://semor@xxxxxxxxxxx/svn/relax/branches/consistency_tests_1.2/test_suite ... ================================ How can I change the log ? Cheers Séb :) Edward d'Auvergne wrote: On Dec 17, 2007 9:02 PM, <sebastien.morin.1@xxxxxxxxx> wrote: Author: semor Date: Mon Dec 17 21:02:55 2007 New Revision: 4200 URL: http://svn.gna.org/viewcvs/relax?rev=4200&view=rev Log: Merging of the 'consistency-tests' branch in the main 1.2 line. The command used was: svnmerge.py merge -r3343,3347-3349,3353-3354,3356-3358,3362,3368,3373-3374,3525-3527,3530,3534,4142-4143 I think this would be the command for the previous commit at r4199 (https://mail.gna.org/public/relax-commits/2007-12/msg00062.html). You didn't use the command: $ svn merge -r3320:4200 svn+ssh://semor@xxxxxxxxxxx/svn/relax/branches/consistency_tests_1.2 in the directory of the 1.2 line instead? Was the last number 4200 or 4199? Regards, Edward These topics were first discussed in the thread starting at https://mail.gna.org/public/relax-devel/2007-06/msg00008.html (Message-id: <4672D803.4060009@xxxxxxxxx>). These additions will allow a user to check consistency for datasets recorded at different magnetic fields by calculating values for consistency functions J(0), Feta and FR2. Added: 1.2/maths_fns/consistency_tests.py - copied unchanged from r3532, branches/consistency_tests_1.2/maths_fns/consistency_tests.py 1.2/prompt/consistency_tests.py - copied unchanged from r3532, branches/consistency_tests_1.2/prompt/consistency_tests.py 1.2/sample_scripts/consistency_tests.py - copied unchanged from r3532, branches/consistency_tests_1.2/sample_scripts/consistency_tests.py 1.2/specific_fns/consistency_tests.py - copied unchanged from r3532, branches/consistency_tests_1.2/specific_fns/consistency_tests.py 1.2/test_suite/consistency_tests.py - copied unchanged from r3532, branches/consistency_tests_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 Modified: 1.2/generic_fns/runs.py URL: http://svn.gna.org/viewcvs/relax/1.2/generic_fns/runs.py?rev=4200&r1=4199&r2=4200&view=diff ============================================================================== --- 1.2/generic_fns/runs.py (original) +++ 1.2/generic_fns/runs.py Mon Dec 17 21:02:55 2007 @@ -38,7 +38,7 @@ raise RelaxRunError, run # List of valid run types. - valid = ['jw', 'mf', 'noe', 'relax_fit', 'srls'] + valid = ['ct', 'jw', 'mf', 'noe', 'relax_fit', 'srls'] # Test if run_type is valid. if not run_type in valid: Modified: 1.2/prompt/__init__.py URL: http://svn.gna.org/viewcvs/relax/1.2/prompt/__init__.py?rev=4200&r1=4199&r2=4200&view=diff ============================================================================== --- 1.2/prompt/__init__.py (original) +++ 1.2/prompt/__init__.py Mon Dec 17 21:02:55 2007 @@ -22,6 +22,7 @@ __all__ = ['angles', + 'consistency_tests', 'command', 'dasha', 'diffusion_tensor', Modified: 1.2/prompt/grace.py URL: http://svn.gna.org/viewcvs/relax/1.2/prompt/grace.py?rev=4200&r1=4199&r2=4200&view=diff ============================================================================== --- 1.2/prompt/grace.py (original) +++ 1.2/prompt/grace.py Mon Dec 17 21:02:55 2007 @@ -25,6 +25,7 @@ from doc_string import regexp_doc import help from generic_fns.minimise import Minimise +from specific_fns.consistency_tests import Consistency_tests from specific_fns.model_free import Model_free from specific_fns.jw_mapping import Jw_mapping from specific_fns.noe import Noe @@ -258,6 +259,7 @@ # Write function. write.__doc__ = write.__doc__ + "\n\n" + regexp_doc() + "\n" + write.__doc__ = write.__doc__ + Consistency_tests.return_data_name.__doc__ + "\n\n" write.__doc__ = write.__doc__ + Minimise.return_data_name.__doc__ + "\n\n" write.__doc__ = write.__doc__ + Noe.return_data_name.__doc__ + "\n" write.__doc__ = write.__doc__ + Relax_fit.return_data_name.__doc__ + "\n" Modified: 1.2/prompt/interpreter.py URL: http://svn.gna.org/viewcvs/relax/1.2/prompt/interpreter.py?rev=4200&r1=4199&r2=4200&view=diff ============================================================================== --- 1.2/prompt/interpreter.py (original) +++ 1.2/prompt/interpreter.py Mon Dec 17 21:02:55 2007 @@ -50,6 +50,7 @@ from pdb import PDB # User classes. +from consistency_tests import Consistency_tests from dasha import Dasha from diffusion_tensor import Diffusion_tensor from grace import Grace @@ -106,6 +107,7 @@ self._system = system # Place the user classes into the interpreter class namespace. + self._Consistency_tests = Consistency_tests(relax) self._Dasha = Dasha(relax) self._Diffusion_tensor = Diffusion_tensor(relax) self._OpenDX = OpenDX(relax) @@ -163,6 +165,7 @@ pdb = self._PDB.pdb # Place the user classes in the local namespace. + consistency_tests = self._Consistency_tests dasha = self._Dasha diffusion_tensor = self._Diffusion_tensor dx = self._OpenDX Modified: 1.2/prompt/molmol.py URL: http://svn.gna.org/viewcvs/relax/1.2/prompt/molmol.py?rev=4200&r1=4199&r2=4200&view=diff ============================================================================== --- 1.2/prompt/molmol.py (original) +++ 1.2/prompt/molmol.py Mon Dec 17 21:02:55 2007 @@ -26,6 +26,7 @@ from doc_string import regexp_doc import help from generic_fns.minimise import Minimise +from specific_fns.consistency_tests import Consistency_tests from specific_fns.model_free import Molmol from specific_fns.jw_mapping import Jw_mapping from specific_fns.noe import Noe Modified: 1.2/prompt/run.py URL: http://svn.gna.org/viewcvs/relax/1.2/prompt/run.py?rev=4200&r1=4199&r2=4200&view=diff ============================================================================== --- 1.2/prompt/run.py (original) +++ 1.2/prompt/run.py Mon Dec 17 21:02:55 2007 @@ -54,6 +54,7 @@ The run name can be any string however the run type can only be one of the following + 'ct': Consistency tests. 'jw': Reduced spectral density mapping, 'mf': Model-free analysis, 'noe': Steady state NOE calculation, Modified: 1.2/prompt/value.py URL: http://svn.gna.org/viewcvs/relax/1.2/prompt/value.py?rev=4200&r1=4199&r2=4200&view=diff ============================================================================== --- 1.2/prompt/value.py (original) +++ 1.2/prompt/value.py Mon Dec 17 21:02:55 2007 @@ -25,6 +25,7 @@ from doc_string import regexp_doc import help from generic_fns.diffusion_tensor import Diffusion_tensor +from specific_fns.consistency_tests import Consistency_tests from specific_fns.model_free import Model_free from specific_fns.jw_mapping import Jw_mapping from specific_fns.relax_fit import Relax_fit @@ -510,6 +511,8 @@ # Copy function. copy.__doc__ = copy.__doc__ + "\n\n" + regexp_doc() + "\n" + copy.__doc__ = copy.__doc__ + Consistency_tests.set.__doc__ + "\n" + copy.__doc__ = copy.__doc__ + Consistency_tests.return_data_name.__doc__ + "\n" copy.__doc__ = copy.__doc__ + Model_free.set_doc.__doc__ + "\n\n" copy.__doc__ = copy.__doc__ + Model_free.return_data_name.__doc__ + "\n" copy.__doc__ = copy.__doc__ + Jw_mapping.set.__doc__ + "\n" @@ -519,12 +522,15 @@ # Display function. display.__doc__ = display.__doc__ + "\n\n" + regexp_doc() + "\n" + display.__doc__ = display.__doc__ + Consistency_tests.return_data_name.__doc__ + "\n" display.__doc__ = display.__doc__ + Model_free.return_data_name.__doc__ + "\n\n" display.__doc__ = display.__doc__ + Jw_mapping.return_data_name.__doc__ + "\n" display.__doc__ = display.__doc__ + Relax_fit.return_data_name.__doc__ + "\n" # Read function. read.__doc__ = read.__doc__ + "\n\n" + regexp_doc() + "\n" + read.__doc__ = read.__doc__ + Consistency_tests.set.__doc__ + "\n" + read.__doc__ = read.__doc__ + Consistency_tests.return_data_name.__doc__ + "\n" read.__doc__ = read.__doc__ + Model_free.set_doc.__doc__ + "\n\n" read.__doc__ = read.__doc__ + Model_free.return_data_name.__doc__ + "\n" read.__doc__ = read.__doc__ + Jw_mapping.set.__doc__ + "\n" @@ -534,6 +540,9 @@ # Set function. set.__doc__ = set.__doc__ + "\n\n" + regexp_doc() + "\n" + set.__doc__ = set.__doc__ + Consistency_tests.set.__doc__ + "\n" + set.__doc__ = set.__doc__ + Consistency_tests.return_data_name.__doc__ + "\n" + set.__doc__ = set.__doc__ + Consistency_tests.default_value.__doc__ + "\n" set.__doc__ = set.__doc__ + Model_free.set_doc.__doc__ + "\n" set.__doc__ = set.__doc__ + Model_free.return_data_name.__doc__ + "\n" set.__doc__ = set.__doc__ + Model_free.default_value.__doc__ + "\n\n" @@ -549,6 +558,7 @@ # Write function. write.__doc__ = write.__doc__ + "\n\n" + regexp_doc() + "\n" + write.__doc__ = write.__doc__ + Consistency_tests.return_data_name.__doc__ + "\n\n" write.__doc__ = write.__doc__ + Model_free.return_data_name.__doc__ + "\n\n" write.__doc__ = write.__doc__ + Jw_mapping.return_data_name.__doc__ + "\n\n" write.__doc__ = write.__doc__ + Noe.return_data_name.__doc__ + "\n" Modified: 1.2/specific_fns/__init__.py URL: http://svn.gna.org/viewcvs/relax/1.2/specific_fns/__init__.py?rev=4200&r1=4199&r2=4200&view=diff ============================================================================== --- 1.2/specific_fns/__init__.py (original) +++ 1.2/specific_fns/__init__.py Mon Dec 17 21:02:55 2007 @@ -21,7 +21,8 @@ ############################################################################### -__all__ = [ 'base_class', +__all__ = [ 'consistency_tests', + 'base_class', 'hybrid', 'jw_mapping', 'main', Modified: 1.2/specific_fns/main.py URL: http://svn.gna.org/viewcvs/relax/1.2/specific_fns/main.py?rev=4200&r1=4199&r2=4200&view=diff ============================================================================== --- 1.2/specific_fns/main.py (original) +++ 1.2/specific_fns/main.py Mon Dec 17 21:02:55 2007 @@ -21,6 +21,7 @@ ############################################################################### +from consistency_tests import Consistency_tests from hybrid import Hybrid from jw_mapping import Jw_mapping from model_free import Model_free @@ -37,6 +38,7 @@ self.relax = relax # Set up all the functions + self.consistency_tests = Consistency_tests(self.relax) self.hybrid = Hybrid(self.relax) self.jw_mapping = Jw_mapping(self.relax) self.model_free = Model_free(self.relax) Modified: 1.2/specific_fns/specific_setup.py URL: http://svn.gna.org/viewcvs/relax/1.2/specific_fns/specific_setup.py?rev=4200&r1=4199&r2=4200&view=diff ============================================================================== --- 1.2/specific_fns/specific_setup.py (original) +++ 1.2/specific_fns/specific_setup.py Mon Dec 17 21:02:55 2007 @@ -37,6 +37,10 @@ # Initialise. string = "this analysis" + # Consistency testing. + if function_type == 'ct': + string = "consistency testing" + # NOE calculation. if function_type == 'noe': string = "NOE calculations" @@ -69,6 +73,10 @@ # Get the function. try: + # Consistency testing. + if function_type == 'ct': + function = self.ct_funcs() + # NOE calculation. if function_type == 'noe': function = self.noe() @@ -205,6 +213,86 @@ # Write results function (Columnar format). if self.eqi == 'write_columnar_results': return self.relax.specific.jw_mapping.write_columnar_results + + + def ct_funcs(self): + """Consistency testing functions.""" + + # Calculate function. + if self.eqi == 'calculate': + return self.relax.specific.consistency_tests.calculate + + # Copy function. + if self.eqi == 'copy': + return self.relax.specific.consistency_tests.copy + + # Create Monte Carlo data function (same as data returning function). + if self.eqi == 'create_mc_data': + return self.relax.specific.consistency_tests.return_data + + # Number of instances. + if self.eqi == 'num_instances': + return self.relax.specific.consistency_tests.num_instances + + # Overfit deselect. + if self.eqi == 'overfit_deselect': + return self.relax.specific.consistency_tests.overfit_deselect + + # Pack Monte Carlo simulation data function. + if self.eqi == 'pack_sim_data': + return self.relax.specific.consistency_tests.sim_pack_data + + # Data returning function. + if self.eqi == 'return_data': + return self.relax.specific.consistency_tests.return_data + + # Data or parameter name returning function. + if self.eqi == 'return_data_name': + return self.relax.specific.consistency_tests.return_data_name + + # Factor of conversion between different parameter units returning function. + if self.eqi == 'return_conversion_factor': + return self.relax.specific.consistency_tests.return_conversion_factor + + # Data error returning function. + if self.eqi == 'return_error': + return self.relax.specific.consistency_tests.return_error + + # Grace string returning function. + if self.eqi == 'return_grace_string': + return self.relax.specific.consistency_tests.return_grace_string + + # Simulation parameter array returning function. + if self.eqi == 'return_sim_param': + return self.relax.specific.consistency_tests.sim_return_param + + # Simulation parameter array returning function. + if self.eqi == 'return_selected_sim': + return self.relax.specific.consistency_tests.sim_return_selected + + # String of the external parameter units returning function. + if self.eqi == 'return_units': + return self.relax.specific.consistency_tests.return_units + + # Value and error returning function. + if self.eqi == 'return_value': + return self.relax.specific.consistency_tests.return_value + + # Set function. + if self.eqi == 'set': + return self.relax.specific.consistency_tests.set + + # Set error function. + if self.eqi == 'set_error': + return self.relax.specific.consistency_tests.set_error + + # Set error function. + if self.eqi == 'set_selected_sim': + return self.relax.specific.consistency_tests.set_selected_sim + + # Write results function (Columnar format). + if self.eqi == 'write_columnar_results': + return self.relax.specific.consistency_tests.write_columnar_results def mf_funcs(self): Modified: 1.2/test_suite/__init__.py URL: http://svn.gna.org/viewcvs/relax/1.2/test_suite/__init__.py?rev=4200&r1=4199&r2=4200&view=diff ============================================================================== --- 1.2/test_suite/__init__.py (original) +++ 1.2/test_suite/__init__.py Mon Dec 17 21:02:55 2007 @@ -22,6 +22,7 @@ __all__ = ['test_suite', + 'consistency_tests', 'diffusion_tensor', 'generic.py', 'jw_mapping', Modified: 1.2/test_suite/test_suite.py URL: http://svn.gna.org/viewcvs/relax/1.2/test_suite/test_suite.py?rev=4200&r1=4199&r2=4200&view=diff ============================================================================== --- 1.2/test_suite/test_suite.py (original) +++ 1.2/test_suite/test_suite.py Mon Dec 17 21:02:55 2007 @@ -27,6 +27,7 @@ # Import the tests. from angles import Angles +from consistency_tests import Consistent from diffusion_tensor import Diffusion_tensor from generic import Generic from jw_mapping import Jw @@ -192,6 +193,23 @@ self.exec_tests(self.jw_test_array) + # Consistency tests tests. + ########################## + + # Heading + self.heading("The consistency tests tests") + + # Initialise the array containing each test element. + self.consistent_test_array = [] + + # User function value.set() test. + self.consistent_test_array.append(Consistent(self.relax, 'set')) + self.consistent_test_array.append(Consistent(self.relax, 'calc')) + + # Execute the tests. + self.exec_tests(self.consistent_test_array) + + # Model selection tests. ######################## @@ -404,6 +422,21 @@ self.summary_line(test) + # Consistentcy tests test. + ########################## + + # Heading. + sys.stdout.write("\nThe consistency tests tests:\n") + + # Loop over the tests. + for test in self.consistent_test_array: + # Synopsis. + global_pass = global_pass and test.passed + + # Print the summary line. + self.summary_line(test) + + # Model selection tests. ######################## _______________________________________________ relax (http://nmr-relax.com) This is the relax-commits mailing list relax-commits@xxxxxxx To unsubscribe from this list, get a password reminder, or change your subscription options, visit the list information page at https://mail.gna.org/listinfo/relax-commits -- Sebastien Morin Etudiant au PhD en biochimie Laboratoire de resonance magnetique nucleaire Dr Stephane Gagne CREFSIP (Universite Laval, Quebec, CANADA) 1-418-656-2131 #4530 -- Sebastien Morin Etudiant au PhD en biochimie Laboratoire de resonance magnetique nucleaire Dr Stephane Gagne CREFSIP (Universite Laval, Quebec, CANADA) 1-418-656-2131 #4530 |