Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

How does the 2.8 branch relate to master? #442

Closed
nrc opened this issue Aug 6, 2019 · 2 comments
Closed

How does the 2.8 branch relate to master? #442

nrc opened this issue Aug 6, 2019 · 2 comments

Comments

@nrc
Copy link

nrc commented Aug 6, 2019

2.8 is the latest release and was released on the 23rd July. However, GH reports there are "545 commits to master since this tag" and I can't work out what commits they are or how master and 2.8 relate to each other.

Could you let me know what is going on there? And what branch will the next version be cut from? master or something else?

Thanks!

@stepancheg
Copy link
Owner

stepancheg commented Aug 6, 2019

  • Master is backwards incompatible with 2.x branches (API is changed slightly but generated code changed more significantly, in particular, it adopted some ideas from other protobuf implementations in rust)
  • 2.x branches are backwards-compatible (as required by semver)

All development happens in master, patches are accepted to master, and patches which do not break backward compatibility are backported to the latest or new 2.x branch.

2.x+1 branch is created from 2.x branch.

  • 2.x+1 version bumps usually happen for larger changes (like these which require increase of the minimum supported Rust version)
  • 2.x.y+1 version bumps are done for minor barely noticeable changes or bugfixes.

So 2.9 will be created from 2.8.

3.0 version will be eventually released from master, the largest issue I want to resolve before 3.0 is large binary size due to a large number of virtual functions in Message trait, and I don't know how to solve it right.

@nrc
Copy link
Author

nrc commented Aug 6, 2019

Thanks for the explanation!

@nrc nrc closed this as completed Aug 6, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

No branches or pull requests

2 participants