Rev 1433: Fix locking in update. in http://people.samba.org/bzr/jelmer/bzr-svn/trunk

[Jelmer Vernooij]

At http://people.samba.org/bzr/jelmer/bzr-svn/trunk

------------------------------------------------------------
revno: 1433
revision-id: jelmer at samba.org-20080704064052-qbuje3mz3nkh1j6e
parent: jelmer at samba.org-20080704054804-fn8ankcj4t0jimmr
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: 0.4
timestamp: Fri 2008-07-04 08:40:52 +0200
message:
  Fix locking in update.
modified:
  workingtree.py                 workingtree.py-20060306120941-b083cb0fdd4a69de
=== modified file 'workingtree.py'
--- a/workingtree.py	2008-07-04 05:48:04 +0000
+++ b/workingtree.py	2008-07-04 06:40:52 +0000
@@ -157,9 +157,9 @@
         if revnum is None:
             # FIXME: should be able to use -1 here
             revnum = self.branch.get_revnum()
-        adm = self._get_wc()
+        adm = self._get_wc(write_lock=True)
         try:
-            conn = self.branch.repository.transport.get_connection()
+            conn = self.branch.repository.transport.connections.get(bzr_to_svn_url(self.branch.base))
             try:
                 update_wc(adm, self.basedir, conn, revnum)
             finally: