Re: Fixes for the xyz branch in the 1.3 line. -- July 28, 2011 - 10:05

Hi Edward,

I tried the merge of the 1.3 brunch to xyz using the svnmerge.py. I typed the following commands:

$ svnmerge.py init

$ svn ci -F svnmerge-commit-message.txt

Then it came the error messages: 

svn: Commit failed (details follow):

svn: Directory '/branches/xyz' is out of date

I could not find a solution to solve it.

Best

Han

On Jul 27, 2011, at 6:14 PM, Edward d'Auvergne wrote:

Hi Han,

I'm made a number of changes to the 1.3 line which will fix many of

the issues in your xyz branch.  This includes a complete redesign (a

big simplification) of the structure.load_spins user function back

end.  The 1.3 line with these changes passes the test suite without

any problems.  Therefore this is ready to be merged into the xyz

branch using svnmerge.  If you'd like to give this a go, please fell

free.  Note you will get one conflict in the file

generic_fns/structure/main.py.  Try to see if you can solve and then

resolve this conflict ;)  Running 'svn st' at the end should no longer

show the conflict.  But ask before committing the change.

Regards,

Edward

P. S.  Note that after the svnmerge, the test suite in the xyz branch

almost passes.

_______________________________________________

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