Rev 1719: Update FAQ in file:///data/jelmer/bzr-svn/trunk/

[Jelmer Vernooij]

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

------------------------------------------------------------
revno: 1719
revision-id: jelmer at samba.org-20080830152650-7vcb567nfs6g2ejf
parent: jelmer at samba.org-20080830111511-2bxw70hbd93argpc
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: trunk
timestamp: Sat 2008-08-30 17:26:50 +0200
message:
  Update FAQ
modified:
  FAQ                            faq-20070910195147-p9u38s9wplds2d4o-1
  TODO                           todo-20060729211917-2kpobww0zyvvo0j2-1
  errors.py                      errors.py-20061226172623-w1sbj8ynpo0eojqp-1
  mapping.py                     mapping.py-20080128201303-6cp01phc0dmc0kiv-1
=== modified file 'FAQ'
--- a/FAQ	2008-08-25 01:58:11 +0000
+++ b/FAQ	2008-08-30 15:26:50 +0000
@@ -32,6 +32,9 @@
 There is no way around this at the moment, because Bazaar has to import all 
 the history from the Subversion branch.
 
+bzr-svn will work significantly faster against a Subversion 1.5 server, so if 
+you have control over the server it may be worthwhile to upgrade it.
+
 Alternatively, you may want to just check out the tip of the Subversion branch
 and access the earlier revisions only when necessary by using stacked branches,
 e.g.::
@@ -66,7 +69,12 @@
 more information about how to do this.
 
 You also need to enable support for this in bzr-svn by setting 
-``override-svn-revprops`` to True in ~/.bazaar/bazaar.conf.
+``override-svn-revprops`` in ~/.bazaar/bazaar.conf to a comma-separated 
+list of Subversion revision properties you would like to override. 
+
+For example::
+
+  override-svn-revprops = svn:log, svn:author
 
 I converted my Subversion repository using svn-import, but now all branches are empty!
 --------------------------------------------------------------------------------------
@@ -100,12 +108,18 @@
 
 bzr-svn sets all kinds of file properties when pushing revisions into Subversion. Is this really necessary?
 -----------------------------------------------------------------------------------------------------------
-Yes, this is because bzr-svn actually supports pushing to Subversion
+Yes, this is because bzr-svn pushes to Subversion while
 retaining the exact same history that is in the Bazaar branch 
-you're pushing. These properties are used for storing Bazaar metadata that 
+you're pushing. 
+
+These properties are used for storing Bazaar metadata that 
 can not be losslessly mapped to existing Subversion metadata. 
 
-It is possible to push changes to Subversion without
+bzr-svn can and will use revision properties rather than file properties 
+if the Subversion server is running Subversion 1.5 or higher. These custom 
+revision properties don't show up in commit notifications or trac.
+
+Alternatively, it is possible to push changes to Subversion without
 setting that metadata by using the ``bzr dpush`` command. 
 Since revisions created in Subversion this way are actually (slightly) 
 different from the matching revisions in the local branch, it is necessary for 
@@ -114,12 +128,6 @@
 You would get a DivergedBranches error when pulling from a svn branch you have 
 just pushed to. 
 
-We have considered setting revision properties with this metadata
-rather than file properties so they don't show up in "svn diff" but
-that requires more work in bzr-svn. Being able to set custom revision
-properties also depends on Subversion 1.5 on the server or modification of the 
-default repository hooks.
-
 If you are using trac, you can get it to ignore these file properties by 
 setting	the ``hide_properties`` setting in the browser section of your 
 configuration to a list of properties that should not be displayed by trac, 

=== modified file 'TODO'
--- a/TODO	2008-08-29 23:55:41 +0000
+++ b/TODO	2008-08-30 15:26:50 +0000
@@ -1,5 +1,4 @@
 mappingv4:
- - refuse to set fileprops on repository on which revprops have been set
  - skip looking for fileprops if revprops have been found in earlier revisions \
    AND server supports revprops AND mapping.supports_custom_revprops()
  - implement layout functions, including command
@@ -9,7 +8,6 @@
 
 todo:
 - generate deltas rather than fulltexts when creating file id maps
-- tests for setting svk:merge from .bzr checkout
 - tests for http-specific SvnRaTransport._request_path() code
 - more blackbox tests
  - svn-import without scheme specified should guess

=== modified file 'errors.py'
--- a/errors.py	2008-08-25 01:58:11 +0000
+++ b/errors.py	2008-08-30 15:26:50 +0000
@@ -68,7 +68,7 @@
 class NotSvnBranchPath(NotBranchError):
     """Error raised when a path was specified that did not exist."""
     _fmt = """%(path)s is not a valid Subversion branch path. 
-See 'bzr help svn-branching-schemes' for details."""
+See 'bzr help svn-repository-layout' for details."""
 
     def __init__(self, branch_path, mapping=None):
         NotBranchError.__init__(self, urllib.quote(branch_path))

=== modified file 'mapping.py'
--- a/mapping.py	2008-08-30 03:08:49 +0000
+++ b/mapping.py	2008-08-30 15:26:50 +0000
@@ -689,7 +689,7 @@
 mapping_registry.register_lazy('v4', 'bzrlib.plugins.svn.mapping4', 
                                'BzrSvnMappingv4',
                                'Fourth format (bzr-svn 0.5.x)')
-mapping_registry.set_default('v3')
+mapping_registry.set_default('v4')
 
 def parse_mapping_name(name):
     assert isinstance(name, str)