[m-rev.] for review: Add constant structure support to Java backend
novalazy at gmail.com
Thu Jan 30 11:05:50 AEDT 2014
On Wed, 29 Jan 2014 20:43:33 +1100, Paul Bone <paul at bone.id.au> wrote:
> On Wed, Jan 29, 2014 at 02:47:24PM +1100, Julien Fischer wrote:
> > On Wed, 29 Jan 2014, Paul Bone wrote:
> >> For review by anyone.
> >> Branches: master, version-14.01-branch
> >> It's not critical that this be put on the release branch, but it'd be nice.
> >> It may improve performance but not by much more than 1%. (Tested using
> >> on MCit's product ODASE.)
> > I'd prefer it if only bug-fixes went on to the release branch for now.
> > (I you feel this change is important we can add it for 14.01.1.)
> I've spoken to the other MC developers, there's no rush to put this in
> Mercury before the next release. So wearing my Mercury developer hat I'm
> happy to include this for 14.01.1 or similar.
> I propose creating a new branch release-14.01.1-features on which this
> change should go, and then be pulled into master and pulled into
> release-14.01.1-branch once it exists.
You could just git cherry-pick onto version-14_01-branch after the
release, then merge version-14_01-branch into master as usual.
> BTW, I considered something similar for the 14.01 release, so that it would
> be easier to put features on the release branch and on master such as
> Zoltan's recent bug fixes. It didn't seem necessary at the time but in
> retrospect it may have been useful. The intention being that if something
> should go on both branches then merges should be easier, it would avoid
> the awkward merges from master onto version-14.01-branch.
I think merging "backwards" from master to a release branch was a mistake.
More information about the reviews