Rev 4463: (andrew) Compare .parent_ids in Revision.__eq__. in file:///home/pqm/archives/thelove/bzr/%2Btrunk/

[Canonical.com Patch Queue Manager]

At file:///home/pqm/archives/thelove/bzr/%2Btrunk/

------------------------------------------------------------
revno: 4463
revision-id: pqm at pqm.ubuntu.com-20090619060736-nqkde65qgofkhq0t
parent: pqm at pqm.ubuntu.com-20090618213920-8d1p9f28uomzfkvl
parent: andrew.bennetts at canonical.com-20090619034711-79zieyngsoggdtoc
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Fri 2009-06-19 07:07:36 +0100
message:
  (andrew) Compare .parent_ids in Revision.__eq__.
modified:
  bzrlib/revision.py             revision.py-20050309040759-e77802c08f3999d5
    ------------------------------------------------------------
    revno: 4462.1.1
    revision-id: andrew.bennetts at canonical.com-20090619034711-79zieyngsoggdtoc
    parent: pqm at pqm.ubuntu.com-20090618213920-8d1p9f28uomzfkvl
    committer: Andrew Bennetts <andrew.bennetts at canonical.com>
    branch nick: trivial
    timestamp: Fri 2009-06-19 13:47:11 +1000
    message:
      Compare .parent_ids in Revision.__eq__.
    modified:
      bzrlib/revision.py             revision.py-20050309040759-e77802c08f3999d5
=== modified file 'bzrlib/revision.py'
--- a/bzrlib/revision.py	2009-04-06 21:01:10 +0000
+++ b/bzrlib/revision.py	2009-06-19 03:47:11 +0000
@@ -68,7 +68,6 @@
     def __eq__(self, other):
         if not isinstance(other, Revision):
             return False
-        # FIXME: rbc 20050930 parent_ids are not being compared
         return (
                 self.inventory_sha1 == other.inventory_sha1
                 and self.revision_id == other.revision_id
@@ -76,7 +75,8 @@
                 and self.message == other.message
                 and self.timezone == other.timezone
                 and self.committer == other.committer
-                and self.properties == other.properties)
+                and self.properties == other.properties
+                and self.parent_ids == other.parent_ids)
 
     def __ne__(self, other):
         return not self.__eq__(other)