Those are finally some good arguments :) I imagine merging from release to master brach only at the time of feature freeze is too late. I'd definitely favour continuous porting as soon as the fixes appear (before the branches diverge which means conflicts).
But even though I like the idea of doing it with a commit hook, I'm afraid that won't be practical. For one, we will have to teach people to open bug fixes against the release branch. When they open it against master (which will happen), we'll have to open a new PR (including fetching the branch into your repo, which is manual work and has its own disadvantages) because 1) we have no way of changing the target branch of the existing PR and 2) merging it into master and then porting it to release would mean that the commit hook will try to put it into master the second time. That (patch already applied) probably would be a special case of a failed merge, which we would need to handle anyway within the hook. Regards, ~~helix84 ------------------------------------------------------------------------------ CenturyLink Cloud: The Leader in Enterprise Cloud Services. Learn Why More Businesses Are Choosing CenturyLink Cloud For Critical Workloads, Development Environments & Everything In Between. Get a Quote or Start a Free Trial Today. http://pubads.g.doubleclick.net/gampad/clk?id=119420431&iu=/4140/ostg.clktrk _______________________________________________ Dspace-devel mailing list Dspace-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/dspace-devel
