On Wed, Dec 9, 2015 at 9:45 AM, Phil Steitz <phil.ste...@gmail.com> wrote: > On 12/9/15 9:13 AM, luc wrote: >> Le 2015-12-09 16:49, Phil Steitz a écrit : >>>> On Dec 9, 2015, at 8:39 AM, luc <l...@spaceroots.org> wrote: >>>> >>>> Hi all, >>>> >>>> The development status for the field-ode branch (linked to issue >>>> MATH-1288) >>>> is now stable. I will therefore merge this branch into the >>>> MATH_3_X branch >>>> very soon now. >>> >>> What about master? >> >> I may merge all the commits as a single one in master or reproduce >> all >> commits from the branch one by one. A single big commit will >> probably be >> more friendly to the list. Separate commits will show the development >> steps. >> >> Also in master, the primitive double API for ode will be changed to >> be consistent with the new API developed for field ode. I could not >> do that in 3.X because these are publis user-oriented interfaces, so >> changing them would introduce a huge incompatibility. >> >> At the end, this is a new feature, not a modification of an >> existing feature, >> so I don't know if the steps before the feature is complete are >> interesting or not. These steps will be available in the MATH_3_X >> branch (and in the field-ode branch), but not in the master branche >> if I do a single big commit. >> >> >> What do you prefer? > > I am not sure. I just wanted to make sure the new feature got into > master as well as 3_X. > > I have been following the branch commits and as long as the record > of these granular commits can be traced, I am fine with the single > commit to master. If you take the single commit approach to master, > will the steps be traceable from master or will we have to go back > to 3_X to trace things? If the latter, it would be good to add > something to the big commit message to direct later archaeological > investigations back to the 3_X branch. What is the standard git way > of dealing with kind of thing?
Just an outsider's perspective, I would expect that people would want the branches to be merged without squashing all the commits down into one mega commit. It's unfortunate that an email would be generated for each one of these, but oh well. ;) > Phil Regards, James --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@commons.apache.org For additional commands, e-mail: dev-h...@commons.apache.org
