On 3/29/2021 6:34 PM, Elijah Newren wrote:... > After sending the initial series, I decided to type up a more thorough > document that > * spelled out in more detail how the sequence of cherry-picks work > * proved why the renames in one pick are always a superset of the > renames in the next > * proved why the renames in one pick are _almost_ always also a > rename in the next > * discussed the counterexample cases in more detail, and why the > optimization is still reasonable > I figured the more extended document would be useful in case people > decide to change how things work in the future (e.g. what if someone > wants to turn on break detection?), and wants to be able to check > whether all the conditions and cases still hold. > > I then also added details about how things work with directory > renames, in the case that merge.directoryRenames is not the default of > "conflict" (which is trivially handled by stopping and dropping the > cache) but is set to true...and found a case that needed more care due > to interactions with some of the earlier optimizations. (The earlier > optimizations could result in bypassing directory rename detection in > one merge because there was no file added to the old directory, but > the no-directory-rename would be cached for subsequent rebases.) > > So I need to get that fixed up and resubmit this series. I look forward to that document. I attempted reading this series yesterday, but did not have the mental energy to convince myself of the correctness (because of things like not knowing this logic that you plan to document). Instead, I'll promise to give round 2 a quicker response. Thanks, -Stolee
