Ok, I'll have a look. Regards,
Edward On 3 August 2010 03:12, Michael Bieri <[email protected]> wrote: > > Follow-up Comment #59, task #6847 (project relax): > > Hi Edward > > i tried to merge the 1.3 line in this one. Unfortunately, there was a > conflict this time: > > $ svnmerge merge > /usr/bin/svnmerge:71: DeprecationWarning: The popen2 module is deprecated. > Use the subprocess module. > import sys, os, getopt, re, types, tempfile, time, popen2, locale > property 'svnmerge-integrated' deleted from '.'. > > --- Merging r11381 through r11385 into '.': > U generic_fns/pipes.py > U generic_fns/align_tensor.py > U scripts/code_validator > U sample_scripts/full_analysis.py > U specific_fns/frame_order.py > C auto_analyses/dauvergne_protocol.py > Summary of conflicts: > Text conflicts: 1 > > property 'svnmerge-integrated' set on '.' > > > I can't commit the merging now! > > Cheers > Michael > > _______________________________________________________ > > Reply to this item at: > > <http://gna.org/task/?6847> > > _______________________________________________ > Nachricht geschickt von/durch Gna! > http://gna.org/ > > _______________________________________________ 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
