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

[Robert Collins]

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
> 
> -Rob
> 
-- 
GPG key available at: <http://www.robertcollins.net/keys.txt>.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 191 bytes
Desc: This is a digitally signed message part
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20060815/0cbf43dc/attachment.pgp