The cleaner solution is to add on top of your previous commits (all based on 7.1rc0), this will make the history more understandable.
But, really, merging in the latest beta is not that bad either. The only downside is one extra log message, not that much of a deal. The code on the ticket is really all commits that are not yet merged, so an unnecessary merge doesn't add anything. If you play around with git you can have it display just the changes with respect to the latest beta. On Friday, April 1, 2016 at 9:31:05 PM UTC+2, Emmanuel Charpentier wrote: > > Dear list, > > three weeks ago, I opened Trac#20190 > <http://trac.sagemath.org/ticket/20190> to upgrade R to 3.2.4. This > worked fine for me, but stumbled on a problem in another Sage installation > (different system libraries). At the time I had no time to explore it. > > This turned out to be an upstream bug > <https://stat.ethz.ch/pipermail/r-devel/2016-March/072447.html>, which > has been resolved, and I now prepare to merge this in. In the interim, Sage > has progressed from 7.1rc0 to 7.2beta2. I followed suit in my local > "develop" branch. > > In order to check that my fix works with current Sage, I merged my local > patch branch with the current develop (works fine). Fine, but now, my patch > contains about 890 (IIRC) commits already in 7.2beta2. Not Fun... > > Furthermore, the Developer's Guide advises against that : > "A special case of merging is merging in the master branch. This > brings your local branch up to date with the newest Sage version. The above > warning against unnecessary merges still applies, though. Try to do all of > your development with the Sage version that you originally started with. > The only reason for merging in the master branch is if you need a new > feature or if your branch conflicts." > > Well, given the current pace (frantic, that is) of Sage upgrades, You'd > better stay up to date. > > Should I > > - revert to by original patch against 7.1rc0, update it and push this > to Trac for review ? Or > - push by jumbo patch ? > > Your advice is expected, > > -- > Emmanuel Charpentier > -- You received this message because you are subscribed to the Google Groups "sage-support" group. To unsubscribe from this group and stop receiving emails from it, send an email to [email protected]. To post to this group, send email to [email protected]. Visit this group at https://groups.google.com/group/sage-support. For more options, visit https://groups.google.com/d/optout.
