Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Diffs-on-share progress tracking ticket #31

Open
11 of 15 tasks
mitchellwrosen opened this issue Jan 21, 2025 · 0 comments
Open
11 of 15 tasks

Diffs-on-share progress tracking ticket #31

mitchellwrosen opened this issue Jan 21, 2025 · 0 comments
Assignees
@mitchellwrosen

Comments

@mitchellwrosen
Copy link
Contributor

mitchellwrosen commented Jan 21, 2025 •
edited
Loading

These are the rough steps remaining for implementing proper three-way diffs on share.

  • Hydrate definitions
  • Convert merge library diff representation to NamespaceTreeDiff
  • Reconcile existing two-way diff infrastructure with new three-way diff infrastructure
    • Conflicts & libdeps diffs – how do they relate to precomputed diff?
  • Clarify the role of "human diff"
  • Generalize LCA to be optional
  • Tweak merge library to expose better just one side's contributions to the changes to libdeps
  • Hook up diff causals endpoint to new three-way diff routine
    • Compute LCA
    • LCA name lookup
  • Decide what to do about "diff namespaces" endpoint
  • Delete old two-way namespace diff stuff
  • Optional: implement faster code for common case that Alice=LCA, i.e. contribution is ahead of main (no need to load LCA, etc)
  • Optional: Mergeblob1.hydrateDefnsLabeledDependencies – don't need self right?
  • After V1: expose conflicts in the diff causals json blob
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Assignees

@mitchellwrosen mitchellwrosen

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

No branches or pull requests
1 participant
@mitchellwrosen