Re: r4621 - /1.3/Re: r4621 - /1.3/|
Hi Ed, Ok. That's why svnmerge was not initialized on the 1.3 line... Cheers, Séb :) Edward d'Auvergne wrote: Hi, Sorry, I might reverse this change. For merging of your improvements to the full_analysis.py script, using the svnmerge program was not necessary. Simply svn with the merge command is needed. The command to merge r4619 and r4620 would have been: svn merge -r4618-4620 svn+ssh://semor@xxxxxxxxxxx/svn/relax/1.2 You would of course need to be in an up to date copy of 1.3. The problem with setting up svnmerge to go from the 1.2 line to the 1.3 line is that it creates a circular dependence problem. There is already an svnmerge link from 1.3 back to 1.2, and setting the reverse is a problem. It doesn't seem obvious, but I have made the same mistake before and the svnmerge program couldn't handle the situation. So I'll revert r4621 but keep r4622 (the merge by svnmerge did the job properly). Regards, Edward On Jan 11, 2008 4:41 AM, <sebastien.morin.1@xxxxxxxxx> wrote:Author: semor Date: Fri Jan 11 04:41:34 2008 New Revision: 4621 URL: http://svn.gna.org/viewcvs/relax?rev=4621&view=rev Log: Initialized merge tracking via "svnmerge" with revisions "1-2505" from svn+ssh://semor@xxxxxxxxxxx/svn/relax/1.2 Modified: 1.3/ (props changed) Propchange: 1.3/ ------------------------------------------------------------------------------ svnmerge-integrated = /1.2:1-2505 _______________________________________________ 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 |