Rev 3532: Revert a change I didn't mean to commit in http://bzr.arbash-meinel.com/branches/bzr/1.6-dev/weave_merge

[John Arbash Meinel]

At http://bzr.arbash-meinel.com/branches/bzr/1.6-dev/weave_merge

------------------------------------------------------------
revno: 3532
revision-id: john at arbash-meinel.com-20080716170138-x5sdqgzoc9meihbs
parent: john at arbash-meinel.com-20080716165932-kpncy92jwvxpqb07
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: weave_merge
timestamp: Wed 2008-07-16 12:01:38 -0500
message:
  Revert a change I didn't mean to commit
-------------- next part --------------
=== modified file 'bzrlib/builtins.py'
--- a/bzrlib/builtins.py	2008-07-16 16:54:06 +0000
+++ b/bzrlib/builtins.py	2008-07-16 17:01:38 +0000
@@ -3556,10 +3556,7 @@
             testament_class = StrictTestament
         else:
             testament_class = Testament
-        if branch == '.':
-            b = Branch.open_containing(branch)[0]
-        else:
-            b = Branch.open(branch)
+        b = WorkingTree.open_containing(branch)[0].branch
         b.lock_read()
         try:
             if revision is None: