commit 49fcd4f794bb96c3dcf729f81c0ffcb19fdadc14
author Jon Skeet <skeet@pobox.com> Tue Jan 27 14:43:10 2009 +0000
committer Jon Skeet <skeet@pobox.com> Tue Jan 27 14:43:10 2009 +0000
tree 8ec88242bda7104a649c2273770605f89a4aba37
parent 642a8140c88dfb61f5f4812fc179e4f42beb4978

Merge extensions correctly

src/ProtocolBuffers.Test/GeneratedMessageTest.cs

diff --git a/src/ProtocolBuffers.Test/GeneratedMessageTest.cs b/src/ProtocolBuffers.Test/GeneratedMessageTest.cs
index 5d0a929..80923ca 100644
--- a/src/ProtocolBuffers.Test/GeneratedMessageTest.cs
+++ b/src/ProtocolBuffers.Test/GeneratedMessageTest.cs
@@ -313,7 +313,6 @@
           .GetExtensionCount(UnitTestProtoFile.RepeatedInt32Extension));
     }
 
-    /* Reinstate this test in the commit where it's fixed...
     [Test]
     public void ExtensionMergeFrom() {
       TestAllExtensions original = TestAllExtensions.CreateBuilder()
@@ -322,8 +321,7 @@
           TestAllExtensions.CreateBuilder().MergeFrom(original).Build();
       Assert.IsTrue((merged.HasExtension(UnitTestProtoFile.OptionalInt32Extension)));
       Assert.AreEqual(1, (int)merged.GetExtension(UnitTestProtoFile.OptionalInt32Extension));
-    }
-    */
+    }    
 
     /* Removed multiple files option for the moment
     [Test]