Bazaar

Merge lp:~spiv/bzr/trivial-pack1.9 into lp:~bzr/bzr/trunk-old

  1. trivial-pack1.9
  2. Merge into trunk-old
Proposed by Andrew Bennetts
Status: Merged
Merged at revision: not available
Proposed branch: lp:~spiv/bzr/trivial-pack1.9
Merge into: lp:~bzr/bzr/trunk-old
Diff against target: 21 lines
To merge this branch: bzr merge lp:~spiv/bzr/trivial-pack1.9
Reviewer Review Type Date Requested Status
Robert Collins (community) Approve
Review via email: mp+7664@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Andrew Bennetts (spiv) wrote :

This is pretty trivial :)

I just happened to notice this FIXME comment in passing, did the obvious fix
and ran a test suite in a quiet moment, and it passed. So here's the patch.

Revision history for this message
Robert Collins (lifeless) wrote :

 review +1

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'bzrlib/revision.py'
2--- bzrlib/revision.py 2009-04-06 21:01:10 +0000
3+++ bzrlib/revision.py 2009-06-19 04:35:12 +0000
4@@ -68,7 +68,6 @@
5 def __eq__(self, other):
6 if not isinstance(other, Revision):
7 return False
8- # FIXME: rbc 20050930 parent_ids are not being compared
9 return (
10 self.inventory_sha1 == other.inventory_sha1
11 and self.revision_id == other.revision_id
12@@ -76,7 +75,8 @@
13 and self.message == other.message
14 and self.timezone == other.timezone
15 and self.committer == other.committer
16- and self.properties == other.properties)
17+ and self.properties == other.properties
18+ and self.parent_ids == other.parent_ids)
19
20 def __ne__(self, other):
21 return not self.__eq__(other)