Permalink
Browse files

History update for release; version bump.

  • Loading branch information...
1 parent 554fc73 commit 485027b970665b39d51dac91a5e0c2f580cd3bf1 @halostatue committed Feb 9, 2013
Showing with 18 additions and 4 deletions.
  1. +13 −0 History.rdoc
  2. +3 −2 README.rdoc
  3. +2 −2 lib/diff/lcs.rb
View
13 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
View
5 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
View
4 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'

0 comments on commit 485027b

Please sign in to comment.