Skip to content

Conversation

@mitchellwrosen
Copy link
Member

Overview

This PR lifts the restriction in diff.branch that disallows diffing branches that don't share a history. We had always planned to handle this case by effectively setting the LCA to the first argument, however the restriction was originally added for performance reasons, as the implementation in this PR isn't efficient (it just sets the causal hash of the LCA, and then proceeds with the rest of the algorithm, which will end up doing unnecessary work in several places). Nonetheless, it now seems like a better idea to just do the inefficient thing and follow up with a more efficient thing soon.

Test coverage

Transcripts and manual testing

Loose ends

More efficient implementation in progress

@mitchellwrosen mitchellwrosen marked this pull request as draft November 4, 2025 16:15
@mitchellwrosen mitchellwrosen marked this pull request as ready for review November 5, 2025 22:23
@aryairani aryairani added this to the 1.0.0 milestone Nov 6, 2025
@aryairani aryairani merged commit 6068fab into trunk Nov 8, 2025
31 checks passed
@aryairani aryairani deleted the 25-11-04-difftool branch November 8, 2025 00:05
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants