Code Monkey home page Code Monkey logo

Comments (8)

mattcaswell avatar mattcaswell commented on July 28, 2024 1

Actually, that's not a bad idea.

from web.

mattcaswell avatar mattcaswell commented on July 28, 2024

A slight problem here is that we haven't actually branched yet (so 3.2 is still running off the master branch). Which of course means that the 3.2 man pages and the master pages will be identical. Not sure if our scripts will be able to handle it if we added 3.2 to the man pages but there is no branch for it...

from web.

mspncp avatar mspncp commented on July 28, 2024

You are right, my reminder was premature. Nevertheless, I'll leave it open as a reminder for the moment when the branch gets created. :-)

from web.

mspncp avatar mspncp commented on July 28, 2024

A slight problem here is that we haven't actually branched yet (so 3.2 is still running off the master branch).

Side note: in my company we solved the problem of "early branching"(*) for QA release candidates by creating release branches on the master branch and fast-forwarding them on master until we decide that the release candidate will be released.

(*) In our case, the branch name affects the name of the build artifacts.

from web.

levitte avatar levitte commented on July 28, 2024

It is a good idea... but you need to know what you do, i.e. not do the natural mistake of releasing from that "early branch". I believe it's the possibility of such a mistake that had led us to dismiss the idea of an "early branch" in previous conversations...

from web.

mspncp avatar mspncp commented on July 28, 2024

Releasing from the 'early' branch is no problem at all. It is not a requirement that the release branch and the master branch must depart immediately at the moment the first version is released. The only essential thing is that the (stricter) policies of the release branch must be obeyed when fast-forwarding.

In other words, the master branch is treated temporarily as a 'staging branch' for the openssl-3.2 branch and only pull requests which are admissible for the release are allowed to be merged to master. The release branch openssl-3.2 follows (i.e, is an ancestor of) the master branch, but fast-forwards of openssl-3.2 to the tip of master branch are made only manually and only as long as all incoming commits on master fulfil the requirements of the release policy. The first commit on master which is not admissible would terminate the fast-forward and would require a true branching.

from web.

mspncp avatar mspncp commented on July 28, 2024

This pattern would be useful for the alpha-phase and the early beta-phase, as long as the overwhelming majority of pull requests is still intended for the release and all others can be withheld for a while. It's the burdon of holding back PRs against the extra burdon of cherry-picking to two branches, which you need to weigh against each other.

from web.

mspncp avatar mspncp commented on July 28, 2024

The permission to push such types of fast-forwards of 'early' release branches to the central repository without pull request is restricted in my company (by pre-receive-hook) and granted only to a small number of people who coordinate the releases.

from web.

Related Issues (20)

Recommend Projects

  • React photo React

    A declarative, efficient, and flexible JavaScript library for building user interfaces.

  • Vue.js photo Vue.js

    🖖 Vue.js is a progressive, incrementally-adoptable JavaScript framework for building UI on the web.

  • Typescript photo Typescript

    TypeScript is a superset of JavaScript that compiles to clean JavaScript output.

  • TensorFlow photo TensorFlow

    An Open Source Machine Learning Framework for Everyone

  • Django photo Django

    The Web framework for perfectionists with deadlines.

  • D3 photo D3

    Bring data to life with SVG, Canvas and HTML. 📊📈🎉

Recommend Topics

  • javascript

    JavaScript (JS) is a lightweight interpreted programming language with first-class functions.

  • web

    Some thing interesting about web. New door for the world.

  • server

    A server is a program made to process requests and deliver data to clients.

  • Machine learning

    Machine learning is a way of modeling and interpreting data that allows a piece of software to respond intelligently.

  • Game

    Some thing interesting about game, make everyone happy.

Recommend Org

  • Facebook photo Facebook

    We are working to build community through open source technology. NB: members must have two-factor auth.

  • Microsoft photo Microsoft

    Open source projects and samples from Microsoft.

  • Google photo Google

    Google ❤️ Open Source for everyone.

  • D3 photo D3

    Data-Driven Documents codes.