Hi, Do you know why you needed to make this change? In the 1.3 line this change already exists. This will make the merging of the branch back into the 1.3 line more difficult. If this is a reversion of a previous patch, a proper 'svn merge' command for removing the offending commit is what is needed.
Regards, Edward On 27 July 2010 06:01, <[email protected]> wrote: > Author: michaelbieri > Date: Tue Jul 27 06:01:30 2010 > New Revision: 11360 > > URL: http://svn.gna.org/viewcvs/relax?rev=11360&view=rev > Log: > Name of status objects are corrected and synchronized with status.py and > controller.py. > > Modified: > branches/bieri_gui/auto_analyses/dauvergne_protocol.py > > Modified: branches/bieri_gui/auto_analyses/dauvergne_protocol.py > URL: > http://svn.gna.org/viewcvs/relax/branches/bieri_gui/auto_analyses/dauvergne_protocol.py?rev=11360&r1=11359&r2=11360&view=diff > ============================================================================== > --- branches/bieri_gui/auto_analyses/dauvergne_protocol.py (original) > +++ branches/bieri_gui/auto_analyses/dauvergne_protocol.py Tue Jul 27 > 06:01:30 2010 > @@ -233,7 +233,7 @@ > self.status = Status() > self.status.dAuvergne_protocol.diff_model = diff_model > self.status.dAuvergne_protocol.mf_models = mf_models > - self.status.dAuvergne_protocol.local_mf_models = local_tm_models > + self.status.dAuvergne_protocol.local_tm_models = local_tm_models > > # Initialise the convergence data structures. > self.conv_data = Container() > > > _______________________________________________ > relax (http://nmr-relax.com) > > This is the relax-commits mailing list > [email protected] > > 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 > _______________________________________________ relax (http://nmr-relax.com) This is the relax-devel mailing list [email protected] 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-devel
