,Hi, The patch is a little complex, and many commits should be merged into one. Here are the commits:
>From 44dbb420592cf2b1adbc3e2e154046bc2b210416 >From 031aa3cd515d0bcdc62152f4068629e7135d1f92 >From 752d3beccb861ed231b4c334e25b8296b1312004 >From cb7532970757128e6cafc2cc83fc97e9983ac32b >From a02e2ad30165294c7af47ac62295a1b301f1346e >From 376175828985d40724a84679ac56e611fa6dd280 >From a6ce37f037c7fd71edc688c7c38325b7d7f5e9c8 >From aabc4344ed7f8c2154b1fb176d6b1655fd1d4142 >From ac86431b8122043d42659458495360d3fcaf8c0f >From bf27d8a29784a23bb1b255149c33a158a789fb20 Those which are good as single commits: 44dbb420592cf2b1adbc3e2e154046bc2b210416 031aa3cd515d0bcdc62152f4068629e7135d1f92 One set of commits which would be better as one is (this is more logical and easier to check as one large change): 752d3beccb861ed231b4c334e25b8296b1312004 cb7532970757128e6cafc2cc83fc97e9983ac32b a02e2ad30165294c7af47ac62295a1b301f1346e 376175828985d40724a84679ac56e611fa6dd280 a6ce37f037c7fd71edc688c7c38325b7d7f5e9c8 The last 3 commits (aabc4344ed7f8c2154b1fb176d6b1655fd1d4142, ac86431b8122043d42659458495360d3fcaf8c0f, bf27d8a29784a23bb1b255149c33a158a789fb20) would also be cleaner and better as one. If it is difficult to merge these, then I can apply them as they are. But one major issue is that the a02e2ad30165294c7af47ac62295a1b301f1346e commit has a Python 3 fatal change. The xrange function does not exist in Python 3. This first line would be better as [None]*len(spectra). It's also best to avoid the [X for Y in Z] syntax to be more compatible with future Python versions. Regards, Edward On 2 August 2013 11:00, Edward d'Auvergne <[email protected]> wrote: > Hi, > > The subversion instructions at http://wiki.nmr-relax.com/Git_patch do > not work, as the patch contains multiple commits and the patch command > applies them all as one change. The individual commits are not > separate. > > Regards, > > Edward > > > > On 2 August 2013 10:29, Troels E. Linnet > <[email protected]> wrote: >> Follow-up Comment #45, sr #3043 (project relax): >> >> Patch for development of NMRPipe seriestab format. >> >> Patch should be applied according to: http://wiki.nmr-relax.com/Git_patch >> >> The reading of multiple columns still need testing. >> An additional dataset will be provided shortly, and test will be setup. >> >> (file #18616) >> _______________________________________________________ >> >> Additional Item Attachment: >> >> File name: seriestab.patch Size:24 KB >> >> >> _______________________________________________________ >> >> Reply to this item at: >> >> <http://gna.org/support/?3043> >> >> _______________________________________________ >> Message sent via/by Gna! >> http://gna.org/ >> >> >> _______________________________________________ >> relax (http://www.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 _______________________________________________ relax (http://www.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
