Author: semor
Date: Tue Dec 18 04:04:22 2007
New Revision: 4204
URL: http://svn.gna.org/viewcvs/relax?rev=4204&view=rev
Log:
Merged revisions 4200,4203 via svnmerge from
svn+ssh://svn.gna.org/svn/relax/1.2
........
r4200 | semor | 2007-12-17 15:02:55 -0500 (Mon, 17 Dec 2007) | 14 lines
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
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.
........
r4203 | semor | 2007-12-17 21:41:18 -0500 (Mon, 17 Dec 2007) | 12 lines
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...
........
Modified:
branches/consistency_tests_1.2/ (props changed)
Propchange: branches/consistency_tests_1.2/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Tue Dec 18 04:04:22 2007
@@ -1,1 +1,1 @@
-/1.2:1-3319,3332,3343-4143
+/1.2:1-3319,3332,3343-4143,4200-4203
r4204 - /branches/consistency_tests_1.2/