Backports, Reintegration, Parallel Development…?
-
Hi,
I submitted a few proposed patches (pull requests) for the 2.1 branch. How is the procedure to get changes made in release branches into the trunk (main branch)? Or is the 2.1 branch considered the trunk?
Obviously, I want the broken traffic shaper not only fixed in 2.1 only, but in the following versions as well.
Are there different versioning/branching/release concepts for the pfsense and the pfsense-tools subrepos? My patches affect both subrepos.
-
Changes should be submitted to master (HEAD, trunk) first, and then re-submitted (or cherry-picked) to the RELENG_2_1 branch after getting into master.
If you submitted a change directly to 2.1 and it didn't get put on master, then you'll need to either submit a separate pull request for master, or give the specific commit IDs of the changes and ask ask for it to be cherry-picked. Or just comment on the closed pull request and ask, but using a separate pull request is nicer because it's less work for us.
-
Thanks for your answer. So, backporting is the strategy.
I submitted my changes (as a pull request) to the master branch now as well.
The repository pfsense-tools, where I had to patch the DSCP kernel patch (for FreeBSD versions 8.3, 9.0, 10.0), appears to be organized a bit differently though.
