GV

GeezerVison

The World Wide Web, restored to 800 pixels of glory.

Home|About|Gaming cabinet|Archives|How it works|Starter sites

On this site

  • Sign in
  • ActionsCI/CD and automation
  • CodespacesCloud development environments
  • All Features
  • Documentation
  • Training
  • Certifications
  • Build with Copilot
  • Customize Copilot
  • Integrations
  • Trending repos
  • GitHub Sponsors
  • Developer articles
  • Enterprises

This view

  • Original page
  • New address

GeezerVison is showing github.com — Track line-count changes when applying fuzzy patches by PHJ2000 · Pull Request #238 · java-diff-utils/java-diff-utils

Conversation

@PHJ2000

@PHJ2000 PHJ2000 commented Oct 5, 2026

Copy link
Copy Markdown
Contributor

Include each delta's line-count change in lastPatchDelta. This also makes lastPatchEnd refer to the end of the resulting chunk, so later fuzzy changes search the right positions.

Adds regressions for shrinking changes (including a shifted input) and an expanding change with a newly inserted matching line. Both tests fail before the fix. Full mvn clean verify passes on Java 17: 154 tests, 3 skipped.

Fixes #237.

Sorry, something went wrong.

Uh oh!

There was an error while loading. Please reload this page.
All reactions
@PHJ2000
Track line-count changes when applying fuzzy patches
9f805b3
@wumpz
wumpz merged commit 9a6f529 into java-diff-utils:master Oct 9, 2026
4 checks passed

Uh oh!

There was an error while loading. Please reload this page.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Uh oh!

There was an error while loading. Please reload this page.

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

Fuzzy patching does not account for earlier changes in line count

Uh oh!

There was an error while loading. Please reload this page.

2 participants

@PHJ2000 @wumpz
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
You are visitor 01402503 — GeezerVison does not store the pages you look up.
Best viewed with Netscape Navigator 4.7 or Internet Explorer 6 at 800×600. No cookies required.