Skip to content

Conversation

@nicoddemus
Copy link
Member

No description provided.

Copy link
Contributor

@blueyed blueyed left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not really a hotfix release since it includes other changes from master, but those hopefully cause not any other problems.

(I would have branched off e1298fa (the merge of 544b4a1 (5.3.3)) for this)

@nicoddemus
Copy link
Member Author

Not really a hotfix release since it includes other changes from master, but those hopefully cause not any other problems.

Indeed, but none of them were really user facing, but no worries, I won't call it a hotfix release then.

(I would have branched off e1298fa (the merge of 544b4a1 (5.3.3)) for this)

I prefer to make the release off the current master, to keep history concise, but thanks for the suggestion.

@nicoddemus nicoddemus merged commit ddfa41b into pytest-dev:master Jan 20, 2020
@nicoddemus nicoddemus deleted the release-5.3.4 branch January 20, 2020 17:26
@blueyed
Copy link
Contributor

blueyed commented Jan 20, 2020

@nicoddemus

I prefer to make the release off the current master, to keep history concise

Why would the history be not concise?
Your argument would make sense in case we would just tag current master, but since you are going through a branch for the release anyway I cannot follow.

@nicoddemus
Copy link
Member Author

Oh I misunderstood your suggestion earlier, I thought you meant to make a branch reverting the original merge, and throw away that branch after the release.

But reading it again I see you meant to create a branch right after 5.3.3, revert the merge commit there, and then merge it into master. Yeah I agree that would have been cleaner, my apologies.

@blueyed
Copy link
Contributor

blueyed commented Jan 22, 2020

@nicoddemus please merge master into features.

@nicoddemus
Copy link
Member Author

Sure, done, thanks for the remainder.

@blueyed blueyed mentioned this pull request Jan 29, 2020
4 tasks
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

Successfully merging this pull request may close these issues.

2 participants