Skip to content

Update diff with meyers_difference#5

Open
dgoldie wants to merge 5 commits intoandyl:masterfrom
dgoldie:update_diff_with_meyers
Open

Update diff with meyers_difference#5
dgoldie wants to merge 5 commits intoandyl:masterfrom
dgoldie:update_diff_with_meyers

Conversation

@dgoldie
Copy link

@dgoldie dgoldie commented Jul 9, 2021

No description provided.

dgoldie and others added 5 commits July 2, 2021 13:11
- using Hex diff and patch
- convert diff to map to pass through json
- 3 test cases
  - insert row
  - delete row
  - insert and delete row
Replace Hex diff and use String.myers_difference
@andyl
Copy link
Owner

andyl commented Jul 16, 2021

Doug: thanks a lot for this! I merged your PR into a dev branch, ran the tests and had a bunch of failed cases. Also: I wonder if the Meyers diff can be translated to/from JSON. Meyer's diff produces a data structure like [[:ins, "Text"], [:eq, "x = 1\n"]]. When you translate back/forth to JSON, the atoms are converted to strings. Will Meyer's diff work with string "keys"?

Please update PR with:

  • 100% passing tests
  • passing tests that demonstrate JSON conversion

THANKS!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants