/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/smart/branch.py

  • Committer: Andrew Bennetts
  • Date: 2007-10-12 05:26:46 UTC
  • mfrom: (2904 +trunk)
  • mto: This revision was merged to the branch mainline in revision 2906.
  • Revision ID: andrew.bennetts@canonical.com-20071012052646-wl95idld3ijjy714
Merge from bzr.dev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/smart/branch.py
135
135
            return FailedSmartServerResponse(('TokenMismatch',))
136
136
        except errors.UnlockableTransport:
137
137
            return FailedSmartServerResponse(('UnlockableTransport',))
 
138
        except errors.LockFailed, e:
 
139
            return FailedSmartServerResponse(('LockFailed', str(e.lock), str(e.why)))
138
140
        branch.repository.leave_lock_in_place()
139
141
        branch.leave_lock_in_place()
140
142
        branch.unlock()