Skip to content
This repository has been archived by the owner on Apr 26, 2024. It is now read-only.

Review differences between matrix-org-hotfixes and release branch #11891

Closed
DMRobertson opened this issue Feb 2, 2022 · 2 comments
Closed

Review differences between matrix-org-hotfixes and release branch #11891

DMRobertson opened this issue Feb 2, 2022 · 2 comments
Labels
T-Task Refactoring, removal, replacement, enabling or disabling functionality, other engineering tasks.

Comments

@DMRobertson
Copy link
Contributor

CI currently fails with a mypy error on the hotfixes branch. This made me wonder how different hotfixes are to our release candidates.

We should review these changes. At the very least, I would like to have a reference for the differences between hotfixes and the release branch.

$ git diff --stat matrix-org-hotfixes..v1.52.0rc1 
   changelog.d/11583.bugfix                     |  1 -
   synapse/handlers/message.py                  |  2 +-
   synapse/handlers/room_member.py              | 56 ++++++++++++++++++--------------------------------------
   synapse/push/httppusher.py                   |  5 -----
   synapse/storage/database.py                  | 40 +---------------------------------------
   synapse/storage/databases/main/client_ips.py |  2 +-
   synapse/storage/databases/main/search.py     |  2 +-
@DMRobertson DMRobertson added T-Task Refactoring, removal, replacement, enabling or disabling functionality, other engineering tasks. z-maintenance labels Feb 2, 2022
@richvdh
Copy link
Member

richvdh commented Feb 2, 2022

dup #4826 I think...

(the diff is pretty small nowadays, and I would love for us to finish cleaning that up)

@DMRobertson
Copy link
Contributor Author

Ahh yes. Sorry, I should search before I file.

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
T-Task Refactoring, removal, replacement, enabling or disabling functionality, other engineering tasks.
Projects
None yet
Development

No branches or pull requests

2 participants