ping : aaron Re: [BUG?] Merge.ensure_revision_trees

[Aaron Bentley]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Robert Collins wrote:
> On Wed, 2006-08-09 at 17:55 +1000, Robert Collins wrote:
>> This looks suspect to me ...
>>
>>     def ensure_revision_trees(self):
>>         if self.this_revision_tree is None:
>>             self.this_basis_tree =
>> self.this_branch.repository.revision_tree(
>>                 self.this_basis)
>>             if self.this_basis == self.this_rev_id:
>>                 self.this_revision_tree = self.this_basis_tree
>>
>>         if self.other_rev_id is None:
>>             other_basis_tree = self.revision_tree(self.other_basis)
>>             changes = other_basis_tree.changes_from(self.other_tree)
>>             if changes.has_changed():
>>                 raise WorkingTreeNotRevision(self.this_tree)
>>             other_rev_id = self.other_basis
>> ............^ should that have self. there ?
>>             self.other_tree = other_basis_tree

Yes, it looks like it should have been.

Aaron
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.2.2 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org

iD8DBQFE4bFh0F+nu1YWqI0RAhhdAJ4zhSCDdZK7NiIlSUkx62Xuw/wu6QCeKKjs
DA7cNBeJ4/mmYBHrJCKsq/s=
=CXM5
-----END PGP SIGNATURE-----