The real point here is not against what the PR is fired but from which branch contributors start to work. We cannot change a PR but we can open a PR from a third repository vs our repository but this doesn't matter as if the contributor start to work on the bug fix from the master we will get all the new features that are already in the master as part of the PR. But which is our real scenario? contributors that want to fix a bug on which version work? I guess that they work on the version in use at their institution not on the master. So we are actually asking them more work, they have the patch ready for the "old" release and we ask to work on the master. Of course they need to work on the master to contribute new features. Just want to note that the atlassian git stash product work in this direction too... https://confluence.atlassian.com/display/STASH/Automatic+branch+merging#Automaticbranchmerging-Branchorderingalgorithm
Andrea Il 24/01/2014 10.28, helix84 ha scritto: > 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 -- Andrea Bollini Dipartimento Servizi e Soluzioni per l'Amministrazione Universitaria Divisione Ricerca Via dei Tizii, 6 00185 Roma, Italy tel. +39 06 44 486 087 - mob. +39 348 82 77 525 http://www.cineca.it ------------------------------------------------------------------------------ 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
