From 7b7bbad00fbf43a7857fd87512e8e2edc4a00b42 Mon Sep 17 00:00:00 2001 From: Andrew Fader Date: Sat, 31 Oct 2026 01:56:48 -0400 Subject: [PATCH 1/4] Allow diff-lcs 2 SuperDiff uses only Diff::LCS.traverse_balanced and traverse_sequences and the ContextChange readers (old/new element and position), which diff-lcs 2 keeps. The unit suite gives the same result on 2.0.0 as on 1.6.2. --- super_diff.gemspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/super_diff.gemspec b/super_diff.gemspec index 3e34e47b..98c02c7f 100644 --- a/super_diff.gemspec +++ b/super_diff.gemspec @@ -28,6 +28,6 @@ Gem::Specification.new do |s| s.executables = Dir['exe/**/*'].map { |f| File.basename(f) } s.add_dependency 'attr_extras', '>= 6.2.4', '< 8' - s.add_dependency 'diff-lcs', '~> 1.5' + s.add_dependency 'diff-lcs', '>= 1.5', '< 3' s.add_dependency 'patience_diff', '~> 1.2' end From 3ca87c64e94731fbd83feb49af8fba0c0c461659 Mon Sep 17 00:00:00 2001 From: Andrew Fader Date: Fri, 6 Nov 2026 17:17:57 -0500 Subject: [PATCH 2/4] Add changelog entry for diff-lcs 2 --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index d8b9ef6b..d31e30a5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,7 @@ ### Other changes - Fixed "Using parts of SuperDiff directly" documentation. [#313](https://github.com/splitwise/super_diff/pull/313) +- Allow diff-lcs 2. [#317](https://github.com/splitwise/super_diff/pull/317) ## 0.19.0 - 2026-05-01 From d5d8ecef7f9455212fb22198476c830eebf3a94a Mon Sep 17 00:00:00 2001 From: Joe Stein <569991+jas14@users.noreply.github.com> Date: Fri, 6 Nov 2026 14:26:25 -0800 Subject: [PATCH 3/4] Add author attribution to changelog --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index d31e30a5..995b4c94 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,7 +4,7 @@ ### Other changes - Fixed "Using parts of SuperDiff directly" documentation. [#313](https://github.com/splitwise/super_diff/pull/313) -- Allow diff-lcs 2. [#317](https://github.com/splitwise/super_diff/pull/317) +- Allow diff-lcs 2. [#317](https://github.com/splitwise/super_diff/pull/317) by [@andrewfader](https://github.com/andrewfader) ## 0.19.0 - 2026-05-01 From 08c549cde4b129d77a8ff3fb2dfd614dcbbb23a0 Mon Sep 17 00:00:00 2001 From: Joe Stein Date: Mon, 9 Nov 2026 07:12:23 -0800 Subject: [PATCH 4/4] Fix Gemfile.lock after merge --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index d0dd8284..aa4a75c0 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -3,7 +3,7 @@ PATH specs: super_diff (0.19.0) attr_extras (>= 6.2.4, < 8) - diff-lcs (~> 1.5) + diff-lcs (>= 1.5, < 3) patience_diff (~> 1.2) GEM