[MERGE] [BUG #162486] RemoteBranch.__init__ should set member variable

John Arbash Meinel john at arbash-meinel.com
Thu Nov 15 18:21:39 GMT 2007


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

Robert Collins wrote:
> On Tue, 2007-11-13 at 15:10 -0600, John Arbash Meinel wrote:
> 
> bb:tweak
> 
>>      def test_simple_revno(self):
>>          tree = self.create_tree_with_merge()
>> -        the_branch = tree.branch
>> +        # Re-open the branch so we make sure we start fresh.
>> +        # see bug #162486
>> +        the_branch = tree.bzrdir.open_branch()
> 
> perhaps just change the helper to do the reopen ?
> 
> -Rob
>   

This is a Branch test, so it means you would have to do:

tree.branch = tree.bzrdir.open_branch()

Which is a little distasteful. (Actually I think WT.branch is a
property, so you would have to do tree._branch = tree.bzrdir.open_branch())

I tried to do:

return tree.bzrdir.open_workingtree()

But that fails for Remote objects with a "No WorkingTree exists for
"bzr://127.0.0.1:50285/tree/". I'm not completely sure how the local
tree object has a bzrdir which it (by all rights) cannot actually have.

John
=:->

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.5 (Cygwin)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org

iD8DBQFHPI4zJdeBCYSNAAMRAh7+AJ9UpEGd0aTFrTZRb9NQgmH301/+BQCfb1CM
SfiKjOE8ebJZIAu3cH/nqCs=
=/RQ4
-----END PGP SIGNATURE-----



More information about the bazaar mailing list