On Tue, Sep 26, 2017 at 12:03:01PM -0400, Doug Ledford wrote: > >> You probably mean the conversation after that pull request. > >> * First round of RC fixes for 4.13 > >> https://marc.info/?l=linux-rdma&m=150039306716272&w=2 > > More than just that conversation. There have been offline conversations > too. Other trees are certainly not doing something as restrictive as 'only base branches off rc2'... branches should be based off a point that makes the patches work, and ideally, the point at which the patches were actually tested. Patches should never, ever be applied against a branch where they are known to be broken (either compile wise, or functionality wise) because of missing dependent patches from other trees. This is all done to make future bisection work properly. Overall, the only solution is to use a variety of bases on a variety of branches. This is what other trees are doing, and AFAIK Linus accepts it. So, in your new multi-branch work flow, when patches come to you, you have to decide if they can be safely applied to an existing branch (eg 'fixes' in arm-soc nomenclature), or if a new feature branch, with a new base is required. You *will* find you have branch bases all over the place due to the co-ordination with other parts of the tree.. And you may find you have feature branches based on your own branches too if things get a bit complex. > I didn't think this would work on k.o (and it's why I did the merge), > but it does work. The reason I didn't think it would work is that > even The multi-branch work flow is less of a 'force push' more of a 'delete the banch once merged', 'create a new branch at a choosen starting point'. The fact the two branch have the same name means most people just handle it with 'git reset --hard' and 'git push -f'.. But it is worth while to have in mind the overall picture that the multi-branch work flow is 'create a branch at good base & apply patches', 'merge the branch', 'discard the branch'.. repeat.. Jason -- To unsubscribe from this list: send the line "unsubscribe linux-rdma" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
