Rev 1751: Don't take over when pulling from WebDAV source (without Subversion) in http://people.samba.org/bzr/jelmer/bzr-svn/trunk

[Jelmer Vernooij]

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

------------------------------------------------------------
revno: 1751
revision-id: jelmer at samba.org-20081109213654-h0bkcj0a4e3qujxz
parent: jelmer at samba.org-20081109205321-t1cm6u5cjdf1lsq6
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: 0.4
timestamp: Sun 2008-11-09 22:36:54 +0100
message:
  Don't take over when pulling from WebDAV source (without Subversion)
modified:
  NEWS                           news-20061231030336-h9fhq245ie0de8bs-1
  format.py                      format.py-20070917005147-94kb7zysotf82kqw-1
=== modified file 'NEWS'
--- a/NEWS	2008-11-09 20:01:34 +0000
+++ b/NEWS	2008-11-09 21:36:54 +0000
@@ -15,6 +15,9 @@
 
    * Fix erroneous call to object.__init__() causing issues with Python2.6.
 
+   * Don't take over when pulling from WebDAV source (without Subversion)
+     (#274840)
+
 bzr-svn 0.4.14	2008-11-03
 
   BUG FIXES

=== modified file 'format.py'
--- a/format.py	2008-08-23 14:55:24 +0000
+++ b/format.py	2008-11-09 21:36:54 +0000
@@ -29,6 +29,8 @@
 from bzrlib import errors as bzr_errors
 """)
 
+ERR_RA_DAV_NOT_VCC = 20014
+
 def get_rich_root_format():
     format = BzrDirFormat.get_default_format()
     if format.repository_format.rich_root_data:
@@ -85,7 +87,7 @@
         try: 
             return remote.SvnRemoteAccess(transport, self)
         except SubversionException, (_, num):
-            if num == errors.ERR_RA_DAV_REQUEST_FAILED:
+            if num in (errors.ERR_RA_DAV_REQUEST_FAILED, ERR_RA_DAV_NOT_VCC):
                 raise bzr_errors.NotBranchError(transport.base)
             raise