How to create patch against 2.7.x code

thermo

So I have a patch which was developed against master branch on github. The patch fails to apply on a 2.7.2 install due to the changes since.
Is there an easy way to obtain a patch for 2.7.2, how do others handle this situation since there isn't a 2.7.2 branch on github (that I could see).

bmeeks

You will need to checkout the RELENG_2_7_2 branch and apply your patch to that.

GitHub branches prefixed with RELENG_ are the release or production branches. The master branch is the current development branch.

You can choose the branch in the web view of GitHub as shown below:

You can also choose the proper branch within git on your builder/development machine using this command:

git checkout RELENG_2_7_2

thermo

@bmeeks Thanks, yes I've seen it now. I have no idea where or what I was looking at last night.

Viper_Rus

Hello. Please tell me if there is a simple method to get this functionality https://redmine.pfsense.org/issues/855
on 2.7.2?

stephenw10

@Viper_Rus said in How to create patch against 2.7.x code:

https://redmine.pfsense.org/issues/855

You can apply the change referenced in the bug via a system patch: 30d46b63834444e9a7a4af310a5d8aaf94baf01a

But you also need this previous changeset: 4bbbcc368bf1da815025fa51268d5de96fa73220

YMMV! But if you do have issues you can just revert the patches.

Steve