Rev 1686: Make sure we don't set the push location from a read transaction. in http://people.samba.org/bzr/jelmer/bzr-svn/trunk

[Jelmer Vernooij]

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

------------------------------------------------------------
revno: 1686
revision-id: jelmer at samba.org-20080831141955-q7spyujgevjfdrgj
parent: jelmer at samba.org-20080831133914-0agydumldcdsowza
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: 0.4
timestamp: Sun 2008-08-31 16:19:55 +0200
message:
  Make sure we don't set the push location from a read transaction.
modified:
  __init__.py                    __init__.py-20051008155114-eae558e6cf149e1d
=== modified file '__init__.py'
--- a/__init__.py	2008-08-27 09:57:53 +0000
+++ b/__init__.py	2008-08-31 14:19:55 +0000
@@ -419,11 +419,11 @@
                     target_branch.unlock()
             except NotBranchError:
                 target_branch = bzrdir.import_branch(source_branch, revision_id, _push_merged=merged)
-            # We successfully created the target, remember it
-            if source_branch.get_push_location() is None or remember:
-                source_branch.set_push_location(target_branch.base)
         finally:
             source_branch.unlock()
+        # We successfully created the target, remember it
+        if source_branch.get_push_location() is None or remember:
+            source_branch.set_push_location(target_branch.base)
 
 register_command(cmd_svn_push)