On Wed, Jul 18, 2012 at 7:09 AM, Travis Oliphant <tra...@continuum.io> wrote: > > Hey all, > > We are going to work on a beta release on the 1.7.x branch. The master is > open again for changes for 1.8.x. There will be some work on the 1.7.x > branch to fix bugs including bugs that are already reported but have not yet > been addressed (like the regression against data-type detection for Sage). > It would be great if 1.7.x gets as much testing as possible so that we can > discover regressions that may have occurred. But, it was important to draw > the line for 1.7.0 features.
There are two strategies for working with maintenance branches: 1) commit bug-fixes to maintenance, merge maintenance back into master as needed 2) commit bug-fixes to master, cherry-pick to maintenance, never merge maintenance back into master Which are we using? (I.e., which branch should bug-fix PRs be submitted against?) -n _______________________________________________ NumPy-Discussion mailing list NumPy-Discussion@scipy.org http://mail.scipy.org/mailman/listinfo/numpy-discussion
