Rev 1896: Always set branching scheme for mappingv3. in file:///data/jelmer/bzr-svn/trunk/

[Jelmer Vernooij]

At file:///data/jelmer/bzr-svn/trunk/

------------------------------------------------------------
revno: 1896
revision-id: jelmer at samba.org-20080909191459-bsaazrna2s4owa4g
parent: jelmer at samba.org-20080909185333-u2h89r2poiurpebt
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: trunk
timestamp: Tue 2008-09-09 21:14:59 +0200
message:
  Always set branching scheme for mappingv3.
modified:
  __init__.py                    __init__.py-20051008155114-eae558e6cf149e1d
=== modified file '__init__.py'
--- a/__init__.py	2008-09-09 18:53:33 +0000
+++ b/__init__.py	2008-09-09 19:14:59 +0000
@@ -451,7 +451,7 @@
         from bzrlib.trace import info
         from bzrlib.plugins.svn.repository import SvnRepository
         from bzrlib.plugins.svn.mapping3.scheme import scheme_from_branch_list
-        from bzrlib.plugins.svn.mapping3 import (config_set_scheme, 
+        from bzrlib.plugins.svn.mapping3 import (BzrSvnMappingv3FileProps, config_set_scheme, 
             get_property_scheme, set_property_scheme)
         def scheme_str(scheme):
             if scheme is None:
@@ -464,7 +464,7 @@
         if repository_wide:
             scheme = get_property_scheme(repos)
         else:
-            scheme = repos.get_mapping().scheme
+            scheme = BzrSvnMappingv3FileProps.from_repository(repos).scheme
         if set:
             schemestr = edit_commit_message("", 
                                             start_message=scheme_str(scheme))