On Fri, Jul 18, 2014 at 11:44 PM, Pauli Virtanen <p...@iki.fi> wrote: > 18.07.2014 23:53, Julian Taylor kirjoitti: >> On 18.07.2014 19:47, Pauli Virtanen wrote: > [clip] >> > The other well-known alternative to bugfixes is to first commit it in >> > the earliest maintenance branch where you want to have it, and then >> > merge that branch forward to the newer maintenance branches, and >> > finally into master. >> >> wouldn't that still require basing bugfixes onto the point before the >> master and maintenance branch diverged? >> otherwise a merge from maintenance to master would include the commits >> that are only part of the maintenance branch (release commits, >> regression fixes etc.) > > If I understand correctly, the idea is to manually revert the changes > that don't belong in, which needs to be only done once for each, as the > merge logic should deal with it in all subsequent merges. > > I think there are in practice not so many commits that you want to have > only in the release branch. Version number bumping is one (and easily > addressed by a follow-up commit in master that bumps it again) --- what > else?
Presumably all the commits that we miss on the first pass and end up backporting the hard way later :-) -- Nathaniel J. Smith Postdoctoral researcher - Informatics - University of Edinburgh http://vorpus.org _______________________________________________ NumPy-Discussion mailing list NumPy-Discussion@scipy.org http://mail.scipy.org/mailman/listinfo/numpy-discussion
