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.

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

hunk dependencies #6077

Draft
wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

hunk dependencies #6077

wants to merge 1 commit into from

Conversation

Byron
Copy link
Collaborator

@Byron Byron commented Jan 24, 2025

Given a set of unified diffs as extracted from worktree changes, along with a set of commits, find the commits that have changed hunks which 'connect' to the changed hunks from the worktree changes.

This association allows to merge these hunks into the right commit as part of 'absorbing' them.

Tasks - but-hunk-dependency

  • write down how it should work on a high-level and how it covers everything that it needs to
  • a first high-level test that exercies the machinery
  • sketch out minimal types to do perform the task

Research Notes

  • (Digested into actual crate)
  • Is it possible to three-way-subtract trees, or blobs, to undo one side of a merge? Dealing with Workspaces is troublesome.

@vercel vercel bot temporarily deployed to Preview – gitbutler-components January 24, 2025 09:27 Inactive
Copy link

vercel bot commented Jan 24, 2025

The latest updates on your projects. Learn more about Vercel for Git ↗︎

Name Status Preview Comments Updated (UTC)
gitbutler-components ✅ Ready (Inspect) Visit Preview 💬 Add feedback Jan 24, 2025 6:39pm
gitbutler-web ✅ Ready (Inspect) Visit Preview 💬 Add feedback Jan 24, 2025 6:39pm

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
rust Pull requests that update Rust code
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant