The last three revisions were all problematic. The best course of
action would be to revert r4647, r4648, and r4649. This will be
necessary to keep your branch in sync with the 1.3 line. For r4647,
these should have been merged rather than blocked. For r4648, please
ignore my comment about merging using "svn merge -r4616:4617
svn+ssh://semor@xxxxxxxxxxx/svn/relax/1.2". This causes a conflict.
To fix the conflict, all the lines such as '<<<<<', '=====', and
'>>>>>' need to be removed. But normally you need to merge the code
above '====' to the code below (delimited by '<<<<<' and '>>>>>').
For r4649, this was necessary because of r4647.
Reverting these 3 revisions and then using svnmerge to take all 1.3
line revisions across to your branch will fix all the problems. Don't
worry about the svnmerge initialisation problem, this was fixed in
r4623 and hence the fix will go into your branch as well.
Cheers,
Edward
On Jan 11, 2008 5:33 PM, <sebastien.morin.1@xxxxxxxxx> wrote:
Author: semor
Date: Fri Jan 11 17:33:51 2008
New Revision: 4649
URL: http://svn.gna.org/viewcvs/relax?rev=4649&view=rev
Log:
Manually ported r4619 and r4620 from the 1.2 line.
This allows one to specify no file for unresolved residues with the
full_analysis.py script.
The command used was:
svn merge -r4618:4620 svn+ssh://semor@xxxxxxxxxxx/svn/relax/1.2
Modified:
branches/consistency_tests_1.3/sample_scripts/full_analysis.py
Modified: branches/consistency_tests_1.3/sample_scripts/full_analysis.py
URL:
http://svn.gna.org/viewcvs/relax/branches/consistency_tests_1.3/sample_scripts/full_analysis.py?rev=4649&r1=4648&r2=4649&view=diff
==============================================================================
--- branches/consistency_tests_1.3/sample_scripts/full_analysis.py
(original)
+++ branches/consistency_tests_1.3/sample_scripts/full_analysis.py Fri Jan
11 17:33:51 2008
@@ -120,7 +120,7 @@
['NOE', '500', 500.208 * 1e6, 'noe.500.out']
]
-# The file containing the list of unresolved residues to exclude from the
analysis.
+# The file containing the list of unresolved residues to exclude from the
analysis (set this to None if no residue is to be excluded).
UNRES = 'unresolved'
# The bond length and CSA values.
@@ -568,7 +568,8 @@
relax_data.read(name, data[0], data[1], data[2], data[3])
# Unselect unresolved residues.
- unselect.read(name, file=UNRES)
+ if UNRES:
+ unselect.read(name, file=UNRES)
# Copy the diffusion tensor from the run 'opt' and prevent it
from being minimised.
if not local_tm:
_______________________________________________
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
Re: r4649 - /branches/consistency_tests_1.3/sample_scripts/full_analysis.py