diff options
author | Austin Ziegler <austin@zieglers.ca> | 2013-02-09 10:36:45 -0500 |
---|---|---|
committer | Austin Ziegler <austin@zieglers.ca> | 2013-02-09 10:36:45 -0500 |
commit | 485027b970665b39d51dac91a5e0c2f580cd3bf1 (patch) | |
tree | 3e79c0ffc015c8ce451e3bfcf892be00b08ba4d8 | |
parent | 554fc733222a33abf7e5e919a9c293ff77d38aa8 (diff) | |
download | diff-lcs-485027b970665b39d51dac91a5e0c2f580cd3bf1.tar.gz |
History update for release; version bump.
-rw-r--r-- | History.rdoc | 13 | ||||
-rw-r--r-- | README.rdoc | 5 | ||||
-rw-r--r-- | lib/diff/lcs.rb | 4 |
3 files changed, 18 insertions, 4 deletions
diff --git a/History.rdoc b/History.rdoc index db67ea4..6cc644d 100644 --- a/History.rdoc +++ b/History.rdoc @@ -1,3 +1,16 @@ +== 1.2.1 / 2013-02-09 + +* Bugs Fixed: + * As seen in https://github.com/rspec/rspec-expectations/pull/200, the + release of Diff::LCS 1.2 introduced an unnecessary public API change to + Diff::LCS::Hunk (see the change at + https://github.com/rspec/rspec-expectations/commit/3d6fc82c for details). + The new method name (and behaviour) is more correct, but I should not have + renamed the function or should have at least provided an alias. This + release restores Diff::LCS::Hunk#unshift as an alias to + #merge. Note that the old #unshift behaviour was incorrect and will not be + restored. + == 1.2.0 / 2013-01-21 * Minor Enhancements: * Added special case handling for Diff::LCS.patch so that it handles patches diff --git a/README.rdoc b/README.rdoc index 4b95814..f7758eb 100644 --- a/README.rdoc +++ b/README.rdoc @@ -11,8 +11,9 @@ Diff::LCS computes the difference between two Enumerable sequences using the McIlroy-Hunt longest common subsequence (LCS) algorithm. It includes utilities to create a simple HTML diff output format and a standard diff-like tool. -This is release 1.2. Everyone is strongly encouraged to upgrade to this version -as it fixes all known outstanding issues. +This is release 1.2.1, restoring the public API to what existed in Diff::LCS +1.1.x. Everyone is strongly encouraged to upgrade to this version as it fixes +all known outstanding issues. == Synopsis diff --git a/lib/diff/lcs.rb b/lib/diff/lcs.rb index 93ffac6..7a8b982 100644 --- a/lib/diff/lcs.rb +++ b/lib/diff/lcs.rb @@ -1,7 +1,7 @@ # -*- ruby encoding: utf-8 -*- module Diff; end unless defined? Diff -# = Diff::LCS 1.2.0 +# = Diff::LCS 1.2.1 # # Computes "intelligent" differences between two sequenced Enumerables. This # is an implementation of the McIlroy-Hunt "diff" algorithm for Enumerable @@ -129,7 +129,7 @@ module Diff; end unless defined? Diff # Common Subsequences</em>, CACM, vol.20, no.5, pp.350-353, May # 1977, with a few minor improvements to improve the speed." module Diff::LCS - VERSION = '1.2.0' + VERSION = '1.2.1' end require 'diff/lcs/callbacks' |