Re: r11360 - /branches/bieri_gui/auto_analyses/dauvergne_protocol.py -- July 28, 2010 - 11:23

Oh well, we will just have to keep this in mind when I merge the
branch back into the main line - I will have to fix things by hand
like you are doing.  This is probably because this line was changed
independently in the branch and in 1.3.  As it is only a single line,
it should not be much of a problem.

Regards,

Edward




On 28 July 2010 07:05, Michael Bieri <michael.bieri@xxxxxxxxxxxxx> wrote:
> That was actually strange. It was nice initially, but after merging, it
> changed back to the wron one again. I used 'svnmerge merge' to merge the
> two lines (branches). I am actually performing this every time before I
> make new changes to my branch.
>
> Cheers
>
> Am 27.07.2010 18:11, schrieb Edward d'Auvergne:
> > 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,<michael.bieri@xxxxxxxxxxxxx>  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
> > > 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
> > _______________________________________________
> > relax (http://nmr-relax.com)
> >
> > This is the relax-devel mailing list
> > relax-devel@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-devel
>
> _______________________________________________
> relax (http://nmr-relax.com)
>
> This is the relax-devel mailing list
> relax-devel@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-devel