Hi Ed ! I think the consistency tests code is ready for integration into the main 1.2 line. I am now in England (Portsmouth) for 3-4 weeks. I am there both for work (weekdays) and tourism (weekends). However, my internet access is, at the moment, quite bad (well, very bad !) and I am not able to do things as in the lab in Quebec City. Thus, I really appreciate your proposal for me to apply to become a relax developer with commit access, but I won't be able to do it until I'm back in Canada at mid-December... Anyway, that'll give me time to read all the documentation for Subversion and relax development. That said, if you want to merge the consistency tests branch before my return to my home lab, feel free to do so, I think the code is now fine, even if there will be things to add to facilitate use... Have a nice day ! Cheers Séb :) Edward d'Auvergne wrote: On Wed, 2007-11-14 at 18:32 -0500, Sébastien Morin wrote:Hi Ed, I'm not sure of what exactly you want me to do, but here is a patch for correcting this bug in the consistency_tests code. patch_l1.2_r3530_bug_10323_consistency_tests That gets me to two questions I want to ask you... 1. When do you plan to integrate the consistency_tests code into the main stream ? I think it's quite ready now for the 1.2 branch. Maybe some errors could be found, but more likely by new users... Also, for the things I would like to add (like 'multiple fields at once' or 'automatic report including graphs and scores') it will be better in the 1.3 branch.If you think this code is ready (to me it looks fine to integrate now), then we can merge the branch now. The way to do this would be to first use svnmerge to apply all of the changes which have occurred in the 1.2 line to the branch. Svnmerge needs to be initialised on your branch, and then all revisions merged. Once the branch and the 1.2 line are in sync, then the branch can be merged back into the 1.2 line. This svnmerge program makes things much simpler than that described in the development chapter of the relax manual. Oh, before the merger I would like to release relax 1.2.12 with the fixes to bugs #10320 and #10323 (https://gna.org/bugs/?10320 and https://gna.org/bugs/?10323). If you like, I would suggest for you to apply to become a relax developer with commit access to the SVN repositories. This will allow you to commit your changes yourself and to have full access to modify relax, the web pages, the bug tracker, the task tracker, etc. If you would like to become a committer, I will then put it to vote on the relax-devel mailing list. Please make sure to read all the relax development chapter to be familiar with the processes involved. With this access you'll be able to merge the branch yourself (it's a very simple task).2. If I would like to work on the 1.3 branch for the consistency_tests code, would it be better to first sync the files so they are all up to date (when compared with the main stream of the 1.3 line). I have not touched the 1.3 consistency tests branch since you copied it from the 1.3 line, so now a lot of differences exists...The svnmerge program is the way to get this branch back into sync. It really makes life much easier, I use it to back-port bug fixes from the 1.3 line to the 1.2 line. For branches, all of the changes which occurred to the line the branch originates from must be merged. Regards, Edward -- 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 |