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

octopus-merge (part 2: blob-merge) #1585

Merged
merged 10 commits into from
Sep 30, 2024
Merged

octopus-merge (part 2: blob-merge) #1585

merged 10 commits into from
Sep 30, 2024

Commits on Sep 26, 2024

  1. add performance notes related to an arena-backed internet BString com… 

    …patible type
    @Byron
    Byron committed Sep 26, 2024
    Configuration menu
    Copy the full SHA
    ec771b4 View commit details
    Browse the repository at this point in the history

  2. add the gix-merge crate for capturing merge algorithms

    @Byron
    Byron committed Sep 26, 2024
    Configuration menu
    Copy the full SHA
    65efcb7 View commit details
    Browse the repository at this point in the history

  3. feat: Add blob::pipeline::WorktreeRoots::is_unset() 

    That way it's easy to determine if a worktree root has any root set.
    @Byron
    Byron committed Sep 26, 2024
    Configuration menu
    Copy the full SHA
    fe7ecd0 View commit details
    Browse the repository at this point in the history

  4. use new WorktreeRoot API provided by gix-diff

    @Byron
    Byron committed Sep 26, 2024
    Configuration menu
    Copy the full SHA
    25c6806 View commit details
    Browse the repository at this point in the history

  5. Sketch the entire API surface to capture all parts of blob-merges

    @Byron
    Byron committed Sep 26, 2024
    Configuration menu
    Copy the full SHA
    9efa09f View commit details
    Browse the repository at this point in the history

Commits on Sep 27, 2024

  1. Implement text and binary merge algorithms, also with baseline te… 

    …sts for correctness.
    @Byron
    Byron committed Sep 27, 2024
    Configuration menu
    Copy the full SHA
    0762846 View commit details
    Browse the repository at this point in the history

  2. fix: ValueRef::as_bstr() now uses the correct lifetime. 

    This makes it more usable as the value lives longer than the ref itself.
    @Byron
    Byron committed Sep 27, 2024
    Configuration menu
    Copy the full SHA
    21bca6c View commit details
    Browse the repository at this point in the history

  3. improve docs around worktree-filters and renormalization

    @Byron
    Byron committed Sep 27, 2024
    Configuration menu
    Copy the full SHA
    ad9587a View commit details
    Browse the repository at this point in the history

Commits on Sep 29, 2024

  1. add all relevant tests for the merge processing pipeline

    @Byron
    Byron committed Sep 29, 2024
    Configuration menu
    Copy the full SHA
    a6f3e30 View commit details
    Browse the repository at this point in the history

Commits on Sep 30, 2024

  1. add platform tests and implementation 

    That way, the platform can be used to perform actual merges.
This will also be a good chance to try the API.
    @Byron
    Byron committed Sep 30, 2024
    Configuration menu
    Copy the full SHA
    eb37dc3 View commit details
    Browse the repository at this point in the history