Massive roll-up of changes. See CHANGES.txt.

1 files changed, 10 insertions, 1 deletions

diff --git a/python/google/protobuf/message.py b/python/google/protobuf/message.py
index 9a88bdc8..f8398474 100755
--- a/python/google/protobuf/message.py
+++ b/python/google/protobuf/message.py
@@ -99,7 +99,7 @@ class Message(object):
     Args:
       other_msg: Message to copy into the current one.
     """
-    if self == other_msg:
+    if self is other_msg:
       return
     self.Clear()
     self.MergeFrom(other_msg)
@@ -108,6 +108,15 @@ class Message(object):
     """Clears all data that was set in the message."""
     raise NotImplementedError
 
+  def SetInParent(self):
+    """Mark this as present in the parent.
+
+    This normally happens automatically when you assign a field of a
+    sub-message, but sometimes you want to make the sub-message
+    present while keeping it empty.  If you find yourself using this,
+    you may want to reconsider your design."""
+    raise NotImplementedError
+
   def IsInitialized(self):
     """Checks if the message is initialized.