Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: aboluo/java-diff-utils
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: master
Choose a base ref
...
head repository: dnaumenko/java-diff-utils
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref
Checking mergeability… Don’t worry, you can still create the pull request.
  • 9 commits
  • 38 files changed
  • 3 contributors

Commits on Feb 28, 2018

  1. Fix for issue dnaumenko#20 correcting empty-context add-only patches 

    Empty-context add-only patches were applied in the wrong place,
typically one line early.

This commit uses the code submitted in the issue but tidied up
and corrected for current master snapshot.
    @catbref
    catbref committed Feb 28, 2018
    Configuration menu
    Copy the full SHA
    614e861 View commit details
    Browse the repository at this point in the history

  2. Correct mistaken use of InsertDelta instead of DeleteDelta 

    Bad copy&paste caused use of InsertDelta instead of DeleteDelta
when applying fix for issue dnaumenko#20.

Also improved test to cover empty-context patches that delete lines
to cover this case.
    @catbref
    catbref committed Feb 28, 2018
    Configuration menu
    Copy the full SHA
    1d6d7c6 View commit details
    Browse the repository at this point in the history

  3. Further to issue dnaumenko#20: corresponding fix to generateUnifiedDi… 

    …ff()

DiffUtils.generateUnifiedDiff() produced off-by-one positions for
hunks with empty context/content.

EmptyContextUnifiedDiffTest.java has been improved to test for this.
(Some test resource files renamed in light of more general use).
    @catbref
    catbref committed Feb 28, 2018
    Configuration menu
    Copy the full SHA
    8df661f View commit details
    Browse the repository at this point in the history

Commits on Jun 24, 2018

  1. Update license header to Apache-1.1 

    - Also modernize README.md
- DiffNode.java original source: https://github.com/apache/wicket/blob/master/wicket-util/src/main/java/org/apache/wicket/util/diff/myers/DiffNode.java
    @koppor
    koppor committed Jun 24, 2018
    Configuration menu
    Copy the full SHA
    e2d4b0a View commit details
    Browse the repository at this point in the history

Commits on Jun 25, 2018

  1. Add Juancarlo Añez (based on JRCS sources)

    @koppor
    koppor committed Jun 25, 2018
    Configuration menu
    Copy the full SHA
    0a4a346 View commit details
    Browse the repository at this point in the history

  2. Merge pull request dnaumenko#38 from java-diff-utils/fix/license 

    Update license header to Apache-1.1
    @dnaumenko
    dnaumenko authored Jun 25, 2018
    Configuration menu
    Copy the full SHA
    8b1e374 View commit details
    Browse the repository at this point in the history

  3. Merge pull request dnaumenko#37 from catbref/master 

    Fix for issue dnaumenko#20 correcting empty-context add-only patches
    @dnaumenko
    dnaumenko authored Jun 25, 2018
    Configuration menu
    Copy the full SHA
    04e6c43 View commit details
    Browse the repository at this point in the history

Commits on Jun 26, 2018

  1. Fix XML in pom.xml

    @koppor
    koppor authored Jun 26, 2018
    Configuration menu
    Copy the full SHA
    1743825 View commit details
    Browse the repository at this point in the history

Commits on Sep 11, 2018

  1. Merge pull request dnaumenko#39 from koppor/patch-1 

    Fix XML in pom.xml
    @dnaumenko
    dnaumenko authored Sep 11, 2018
    Configuration menu
    Copy the full SHA
    8c71647 View commit details
    Browse the repository at this point in the history
Loading