This large diff affects 125 files.

oof

In D25036#1081, @speck wrote:

This large diff affects 125 files.

oof

Yeeeeah lol... a bit much.. A lot is organized into separate commits in a merging-upstream branch locally.. It would probably be easier to look at it that way, in a branch I suppose

Heads up that Evan us actively working on other changes upstream which includes both PHP 8.1 compatibilities and some additional fixes for the recent Git changes.

In D25036#1083, @speck wrote:

Heads up that Evan us actively working on other changes upstream which includes both PHP 8.1 compatibilities and some additional fixes for the recent Git changes.

Sounds good... and maybe this diff can just be closed... I wanted to find a way to do it, but I don't know if this way is ideal... maybe each commit should be a separate diff.. I thought it would be best to push up a branch so that it can be diff'd with master, and each commit can be viewed that way... but could also try adding each commit into Differential separately...

I can just go back through after he does the PHP 8.1 updates, in that case might hold off on uploading each commit as a patch for now

I think we should either just git merge the upstream in, or cherry-pick individual commits - that way we'll still have all the history of each change.

In D25036#1086, @avivey wrote:

I think we should either just git merge the upstream in, or cherry-pick individual commits - that way we'll still have all the history of each change.

Could try that, I'll see how much harder or easier it is with that method... but in that case I think it would rule out Differential patches as method for reviewing and testing, right?

In D25036#1087, @dcog wrote:

In D25036#1086, @avivey wrote:

I think we should either just git merge the upstream in, or cherry-pick individual commits - that way we'll still have all the history of each change.

Could try that, I'll see how much harder or easier it is with that method... but in that case I think it would rule out Differential patches as method for reviewing and testing, right?

Yeah, that precludes Differential... Audit should mostly work, but only post-merge.

There was some discussion in history to allow "pull requests" - review a set of commits and keep them when landing.