Which revision to apply?
-
I had the issue with WOL not working on my 32bit version. I found a thread that linked to a bug, but there appear to be two associated revisions. I can't figure out which one I should be using and what the difference is. Here's the bug I'm talking about:
https://redmine.pfsense.org/issues/4318 -
The patches are totally identical, so why does this matter?
-
I looked at some other bugs and found two revisions as well. When I download the full files (even if the diffs are the same) I notice differences so I wasn't sure if there was a specific thing I should be looking for to decide which one to apply in general or if it never mattered.
-
One is master and one is RELENG_2_2 branch. Why would you download full files?! Install the system patches package and stick the commit ID there.
-
I never said I downloaded the whole files to patch the system. I downloaded them to see if I could figure out what the difference is between the two revisions on my own. I'm new to patching as I've never had to do it before. I found how to install the patch package and use it, but wanted to make sure I always applied the right patches in case they weren't the same.
Is there a reason you have to come across so harsh? All I'm trying to do is understand why there were two revisions for one bug. -
master is for ongoing development and will become V2.3, V3.0 etc in future.
RELENG_2_2 is for 2.2-RELEASE and ongoing fixes… coming for 2.2.1, 2.2.2, 2.2.3...At the moment both streams have similar code, but one day there will be new (and potentially incompatible) things in master that are not in RELENG_2_2.
To apply a fix to a 2.2 system, always use the commit/patch from RELENG_2_2 branch.
-
Thanks phil.davis for explaining this in more detail. I think my only other question is how do I tell which branch I'm in? When I click on the revision links I don't see anything indicating the branch.
-
Yeh, that's a pain - I can't see an easy way to click through to anything useful there.
It is hidden in the URL though. For example, one of the diffs is at:
https://redmine.pfsense.org/projects/pfsense/repository/revisions/e69a0cf3a216c8647a6def4eee41ab01319ce90f/diff/etc/inc/util.inc
The commit in GitHub is at:
https://github.com/pfsense/pfsense/commit/e69a0cf3a216c8647a6def4eee41ab01319ce90f
Bringing up that GitHub URL shows it is RELENG_2_2The other diff is at:
https://redmine.pfsense.org/projects/pfsense/repository/revisions/7094c303b7d46c9f7b24c3f1bd4432187832e85c/diff/etc/inc/util.inc
and at GitHub:
https://github.com/pfsense/pfsense/commit/7094c303b7d46c9f7b24c3f1bd4432187832e85c
shows master.This ivolves cut-and-pasting the magic hex numbers from 1 URL to another. If someone knows an easier way to get back from RedMine diffs to GitHub commits please post.
-
you can paste the revision number only (e.g. e69a0cf3a216c8647a6def4eee41ab01319ce90f) into the system patches package. It'll form a proper github URL from that.
-
You could also use the repository browser on redmine to look at commits in branches… https://redmine.pfsense.org/projects/pfsense/repository
-
I was actually about to respond to phil.davis saying that I noticed on my patch screen it has the github URL for the patch file, like:
http://github.com/pfsense/pfsense/commit/e69a0cf3a216c8647a6def4eee41ab01319ce90f.patch
So if I take off the .patch, that brings me to the page that shows me which branch it's on.
It's still trial and error through to see if I got the right one. I also tried browsing the repo and finding one of the files that was patched and seeing which ID it should be, but that's more difficult IMO than the method above.
It would just be easier to have the branch identified on the revision but I don't do this often so as long as I have a way to verify I'm getting the right patch that helps me out a lot.
