Rev 683: work around another assert in the subversion bindings. in file:///data/jelmer/bzr-svn/0.4/
Jelmer Vernooij
jelmer at samba.org
Mon Sep 10 00:34:02 BST 2007
At file:///data/jelmer/bzr-svn/0.4/
------------------------------------------------------------
revno: 683
tags: bzr-svn-0.4.2
revision-id: jelmer at samba.org-20070909011307-a3opiz4wyikoo94c
parent: jelmer at samba.org-20070909004131-j4rdbl4nizucf8zg
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: 0.4
timestamp: Sun 2007-09-09 03:13:07 +0200
message:
work around another assert in the subversion bindings.
modified:
transport.py transport.py-20060406231150-b3472d06b3a0818d
=== modified file 'transport.py'
--- a/transport.py 2007-09-07 11:42:39 +0000
+++ b/transport.py 2007-09-09 01:13:07 +0000
@@ -354,11 +354,13 @@
return svn.ra.get_dir(self._ra, path, revnum)
def _request_path(self, relpath):
- if self._backing_url != self.svn_url:
- relpath = urlutils.join(
- urlutils.relative_url(self._backing_url, self.svn_url),
- relpath)
- return relpath
+ if self._backing_url == self.svn_url:
+ return relpath
+ newrelpath = urlutils.join(
+ urlutils.relative_url(self._backing_url, self.svn_url),
+ relpath).rstrip("/")
+ self.mutter('request path %r -> %r' % (relpath, newrelpath))
+ return newrelpath
@convert_svn_error
def list_dir(self, relpath):
More information about the bazaar-commits
mailing list