0
@@ -123,7 +123,10 @@ module ActiveRecord
0
         attr = attr.to_s
0
 
0
         # The attribute already has an unsaved change.
0
-        unless changed_attributes.include?(attr)
0
+        if changed_attributes.include?(attr)
0
+          old = changed_attributes[attr]
0
+          changed_attributes.delete(attr) unless field_changed?(attr, old, value)
0
+        else
0
           old = clone_attribute_value(:read_attribute, attr)
0
           changed_attributes[attr] = old if field_changed?(attr, old, value)
0
         end

0
@@ -191,6 +191,42 @@ class DirtyTest < ActiveRecord::TestCase
0
     assert !pirate.changed?
0
   end
0
 
0
+  def test_reverted_changes_are_not_dirty
0
+    phrase = "shiver me timbers"
0
+    pirate = Pirate.create!(:catchphrase => phrase)
0
+    pirate.catchphrase = "*hic*"
0
+    assert pirate.changed?
0
+    pirate.catchphrase = phrase
0
+    assert !pirate.changed?
0
+  end
0
+
0
+  def test_reverted_changes_are_not_dirty_after_multiple_changes
0
+    phrase = "shiver me timbers"
0
+    pirate = Pirate.create!(:catchphrase => phrase)
0
+    10.times do |i|
0
+      pirate.catchphrase = "*hic*" * i
0
+      assert pirate.changed?
0
+    end
0
+    assert pirate.changed?
0
+    pirate.catchphrase = phrase
0
+    assert !pirate.changed?
0
+  end
0
+
0
+
0
+  def test_reverted_changes_are_not_dirty_going_from_nil_to_value_and_back
0
+    pirate = Pirate.create!(:catchphrase => "Yar!")
0
+
0
+    pirate.parrot_id = 1
0
+    assert pirate.changed?
0
+    assert pirate.parrot_id_changed?
0
+    assert !pirate.catchphrase_changed?
0
+
0
+    pirate.parrot_id = nil
0
+    assert !pirate.changed?
0
+    assert !pirate.parrot_id_changed?
0
+    assert !pirate.catchphrase_changed?
0
+  end
0
+
0
   def test_save_should_store_serialized_attributes_even_with_partial_updates
0
     with_partial_updates(Topic) do
0
       topic = Topic.create!(:content => {:a => "a"})