Hi, Commits cannot be migrated between branches, as that makes the merge back to trunk a nightmare. This has happened once before in relax, a long, long time ago, and I'd prefer to avoid that hell. I had to manually port each commit, one-by-one back into the trunk from the mangled branch. I know that this problem exists in both git and svn. Can you just write them directly into 'disp_speed'? What system tests do you plan on adding?
Cheers, Edward On 22 May 2014 11:14, Troels Emtekær Linnet <[email protected]> wrote: > Hi Ed. > > I am just playing a little. > > I do not want to write system test right now in trunk, that I know will fail. > > So, I will write them in "disp_speed_compare". > Then I will try to see if I can import from "disp_speed_compare" to > "disp_speed". > > If not, I will just copy over manually and try it. > > Best > Troels > > > > > 2014-05-22 11:00 GMT+02:00 Edward d'Auvergne <[email protected]>: >> It might be too difficult to synchronise the two branches, then manage >> to merge them together (well one after the other) into the trunk. >> >> Regards, >> >> Edward >> >> On 22 May 2014 10:58, Edward d'Auvergne <[email protected]> wrote: >>> Hi Troels, >>> >>> Do you mean the unit tests of lib.dispersion rather than system tests? >>> For merging everything together, it might be better to add the unit >>> tests to the trunk. Or even better to your 'disp_speed' branch. >>> Otherwise you will not see these changes in the 'disp_speed' branch. >>> >>> Regards, >>> >>> Edward >>> >>> >>> >>> >>> >>> On 22 May 2014 10:42, <[email protected]> wrote: >>>> Author: tlinnet >>>> Date: Thu May 22 10:42:17 2014 >>>> New Revision: 23323 >>>> >>>> URL: http://svn.gna.org/viewcvs/relax?rev=23323&view=rev >>>> Log: >>>> Branch created from trunk to compare to the disp_speed branch. >>>> >>>> The branch will be used to write a range of system tests that should >>>> fail in the trunk, and now pass in the disp_speed branch. >>>> >>>> This is to investigate: >>>> Bug #22024 (https://gna.org/bugs/index.php?22024) Minimisation space for >>>> CR72 is catastrophic. The chi2 surface over dw and pA is bounded. >>>> >>>> >>>> Added: >>>> branches/disp_speed_compare/ >>>> - copied from r23322, trunk/ >>>> >>>> >>>> _______________________________________________ >>>> relax (http://www.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://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
