How to tell when commits have made it into snapshots?

luckman212

I'm now actively testing 2.4 snapshots and watching the commits as they come. I was about to file a bugreport when I noticed redmine #7171 for the same issue, and that a fix had already been pushed 3 days ago. I was surprised I guess that after updating to today's snap 2.4.0.b.20170202.0209, the fix wasn't baked in.

Is there some way to tell when commits to master have been rolled into a snapshot? Or some formula (after x days, etc)

Thanks, and sorry if this is a dumb question

doktornotor


cat /etc/version.lastcommit

luckman212

Thanks but I am still confused

# cat /etc/version.lastcommit
6c8e516ac626f389ffb404194e982cc8ad87b129

all of these generate 404's for me…
https://github.com/pfsense/pfsense/commit/6c8e516ac626f389ffb404194e982cc8ad87b129
https://github.com/pfsense/pfsense-packages/commit/6c8e516ac626f389ffb404194e982cc8ad87b129
https://github.com/pfsense/FreeBSD-src/commit/6c8e516ac626f389ffb404194e982cc8ad87b129
https://github.com/pfsense/FreeBSD-ports/commit/6c8e516ac626f389ffb404194e982cc8ad87b129

Guest

@luckman212:

Thanks but I am still confused
# cat /etc/version.lastcommit
6c8e516ac626f389ffb404194e982cc8ad87b129
all of these generate 404's for me…
https://github.com/pfsense/pfsense/commit/6c8e516ac626f389ffb404194e982cc8ad87b129
https://github.com/pfsense/pfsense-packages/commit/6c8e516ac626f389ffb404194e982cc8ad87b129
https://github.com/pfsense/FreeBSD-src/commit/6c8e516ac626f389ffb404194e982cc8ad87b129
https://github.com/pfsense/FreeBSD-ports/commit/6c8e516ac626f389ffb404194e982cc8ad87b129

Commits don't mean they get into the mainline. Commits are created when changes are made to a repo. PR's( Pull Requests ) are then issued on that commit. Not all commits end up with a PR, and not all PR's end up in the mainline.

A commit ID is nothing to go by. I sent you a patch, that's a commit ID. That ID was generated from my fork of pfSense. When testing by my testers has been completed and they ALL give a thumbs up then I will issue a PR to the main pfSense repo. It then gets reviewed by the developers and checks are made for any issues I may not have foreseen, and as is usual in my case, format errors. Once all that is done then it gets pulled and will make it into the next snapshot. Time consuming but the only way to avoid problems, and even then regressions can creep in.

You're getting 404's as that commit ID has been deleted, sometimes it's because it's been pulled but may also be because it's been scrapped or superseded.

In the case of redmine though, if it says resolved I would have assumed it's been pulled.

phil.davis

From the latest version that I just upgraded to:

[2.4.0-BETA][root@pf240.localdomain]/etc: cat version.lastcommit
5ea71ebda681dbab323ccdb44ab3bfdea7c0f5d6

https://github.com/pfsense/pfsense/commit/5ea71ebda681dbab323ccdb44ab3bfdea7c0f5d6

And that takes me to the commit.
The commit id should always be one that is a commit in master (or RELENG_2_3_ branch. and those commits should exist "forever".