Movatterモバイル変換


[0]ホーム

URL:


Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Sign up
Appearance settings

Referenced oldest but still maintained version in contributing documenta...#2859

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 ourterms of service andprivacy statement. We’ll occasionally send you account related emails.

Already on GitHub?Sign in to your account

Merged
weaverryan merged 1 commit intosymfony:2.2fromdosten:reference_stable_version
Aug 17, 2013
Merged

Referenced oldest but still maintained version in contributing documenta...#2859

weaverryan merged 1 commit intosymfony:2.2fromdosten:reference_stable_version
Aug 17, 2013

Conversation

dosten
Copy link
Contributor

...tion.

QA
Doc fix?yes
New docs?no
Applies to2.2+
Fixed tickets-

@wouterj
Copy link
Member

I'm going to close this one. The 2.2 branch wasn't deprecated when 2,2 was released (you can imagine why... ;-) ). And changing it in that branch is againstour update process:

When a Release reaches "end of maintenance"

...

  • All branches still under maintenance (e.g. 2.2 and higher) are updated to reflect that pull requests should start from the now-oldest maintained version (e.g. 2.2).

@xabbuh
Copy link
Member

From the document you are refering to:

When a release reaches its end of maintenance, the following items are done. For this example, suppose version 2.1 has just reached its end of maintenance:

  • [...]
  • All branches still under maintenance (e.g. 2.2 and higher) are updated to reflect that pull requests should start from the now-oldest maintained version (e.g. 2.2).

[...]

For me, that's exactly the case with this PR.

@wouterj
Copy link
Member

No, when 2.2 reached end of maintenance, branch 2.3 and higher are under maintenance, 2.2 is not.

This PR is fixing it for the 2.2 branch, the 2.3+ branches are already updated with this.

@xabbuh
Copy link
Member

But we are talking about 2.1 which indeed reached its end of maintenance. Thus, according to the steps to be done pull requests for bugfixes should be based on the 2.2 branch. And this is currently not reflected in the documentation.

If someone is willing to contribute he or she may currently be tempted to start with the 2.1 branch:

All bug fixes merged into maintenance branches are also merged into more recent branches on a regular basis. For instance, if you submit a patch for the 2.1 branch, the patch will also be applied by the core team on the master branch.

@wouterj
Copy link
Member

after a short chat with@xabbuh I think I was wrong. I'm a bit dizzy about all these versions currently, so I just reopen it and let@weaverryan decide on this one.

@wouterjwouterj reopened thisJul 30, 2013
@weaverryan
Copy link
Member

Hi guys!

Yes, it can be confusing, but I'm glad you all went back to our written documentation for our release process. That means we'll be consistent, and if there is some way to improve that process, we can change that document :).

In this case, I also agree with@xabbuh's last comment - I think this PR perfectly addresses what should have happened when 2.1 reached end of life (we didn't have our release process in place then, so we're just catching up a little still, which is totally fine).

So, I'm going to merge in - thanks Diego for this!

weaverryan added a commit that referenced this pull requestAug 17, 2013
Referenced oldest but still maintained version in contributing documenta...
@weaverryanweaverryan merged commit43dd04a intosymfony:2.2Aug 17, 2013
@dostendosten deleted the reference_stable_version branchAugust 18, 2013 01:29
Sign up for freeto join this conversation on GitHub. Already have an account?Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

4 participants
@dosten@wouterj@xabbuh@weaverryan

[8]ページ先頭

©2009-2025 Movatter.jp