Unmerged commits from golang/protobuf

[awalterschulze]

gogoprotobuf: All commits on master up to Aug 27, 2019 have been merged - golang/protobuf@822fe56

This message is repeatedly edited to reflect the newest merged commit

[tamird]

I've opened #319 to track merging up to golang/protobuf@748d386 - feel free to close that issue.

[awalterschulze]

Sorry for the delay.

[tamird]

No worries, thanks! Could you roll forward up to golang/protobuf@1909bc2?

[awalterschulze]

done

[a-robinson]

Sorry for the noob question, but what's the actual process for doing the update? I'm interested in locally updating gogoproto on top of upstream's dev branch to test out some recent performance improvements (golang/protobuf@8cc9e46), but the process for merging in new upstream commits doesn't appear to be documented.

[tamird]

My guess is it's something like `git -C ../../golang/protobuf show 8cc9e46 | git apply`.

…

On Thu, Nov 9, 2017 at 12:33 PM, Alex Robinson ***@***.***> wrote: Sorry for the noob question, but what's the actual process for doing the update? I'm interested in locally updating gogoproto on top of grpc's dev branch to test out some recent performance improvements (golang/protobuf@ 8cc9e46 <golang/protobuf@8cc9e46>), but the process for merging in new upstream commits doesn't appear to be documented. — You are receiving this because you commented. Reply to this email directly, view it on GitHub <#191 (comment)>, or mute the thread <https://github.com/notifications/unsubscribe-auth/ABdsPOiuyyztbTg9HzmXLOF_JBPmvGsHks5s0zdogaJpZM4JVEmk> .

[awalterschulze]

The process is: I manually do it when I get time using DiffMerge.app
I also read most of the code to make sure it won't interfere with gogoproto features.

[awalterschulze]

I have to read especially carefully in generator.go and jsonpb.go, since there is quite a big diff already.
That diff seems really big so I'll probably do that in several steps.

[awalterschulze]

Sorry for the bad news. The process is really old school and painful.