search

transmission / transmission

Official Transmission BitTorrent client repository
https://transmissionbt.com
Other
12.02k stars 1.2k forks source link

fix: add missing `write()` call in MSE handshake #6891

Closed tearfur closed 3 weeks ago

tearfur commented 3 months ago

Fixes #6879. Regression from #6025.

Big thanks to @reardonia for catching it, I would have never noticed this.

reardonia commented 2 months ago

This now collides with #6949 , not sure how I can apply both and test together? This long backlog of PR's is getting to be a problem.

tearfur commented 2 months ago

This is sadly the reality I've been facing for the bigger half of the past year or so.

Could you please show the conflict? I'll tell you how it should be resolved.

reardonia commented 2 months ago

your 6a46154 collides. I could resolve by hand but that's no fun. I'm just using "git apply" locally with each of your PR; maybe there is a more efficient way?

do you have a branch that accumulates your changes that we could track, rather than picking up your fixes? (yes I realize that's the moral equivalent of forking, which you and everyone wants to avoid, but during this long lull it's really the only sane option)

nevack commented 2 months ago

your 6a46154 collides. I could resolve by hand but that's no fun. I'm just using "git apply" locally with each of your PR; maybe there is a more efficient way?

Add tearfur's fork as a remote Fetch his branches you are interested in from this new remote. Rebase your branch on top of the branch you want to fix conflict with.