| commit | cb7fc657167962216bab007cd01a74945349cf17 | [log] [tgz] |
|---|---|---|
| author | csharptest <roger@csharptest.net> | Fri Nov 19 10:59:50 2010 -0600 |
| committer | csharptest <roger@csharptest.net> | Fri Nov 19 10:59:50 2010 -0600 |
| tree | dee79ab5985146e9c4e342e1e127524c00f99418 | |
| parent | 272cb8aee775de65e08b4ab17c485cd678d08266 [diff] [blame] |
Tests and fixes
diff --git a/src/ProtocolBuffers/GeneratedBuilder.cs b/src/ProtocolBuffers/GeneratedBuilder.cs index 01d3d2d..2ec2762 100644 --- a/src/ProtocolBuffers/GeneratedBuilder.cs +++ b/src/ProtocolBuffers/GeneratedBuilder.cs
@@ -158,6 +158,10 @@ this[field] = entry.Value; } } + + //Fix for unknown fields not merging, see java's AbstractMessage.Builder<T> line 236 + MergeUnknownFields(other.UnknownFields); + return ThisBuilder; }