More upgrade improvements.

[jelmer/subvertpy.git] / README

diff --git a/README b/README
index 166a545b6417569003772675fda9ee9c444987d1..6290bd878483d934aba3ace5dbdbe6abd33457a4 100644 (file)
--- a/README
+++ b/README
@@ -53,10 +53,13 @@ The following features are currently present:
 
 .. _svn2bzr: http://bazaar-vcs.org/svn2bzr
 
-- Ability to track merges done with SVK_ and write merges from SVK/Subversion branches in a format understandable by SVK.
+- Ability to track merges done with SVK_ and write merges from SVK/Subversion 
+  branches in a format understandable by SVK.
 
 .. _SVK: http://svk.elixus.org/
 
+- Writes svn:mergeinfo property used by Subversion 1.5.
+
 - Generates consistent file ids and revision ids. Two branches made using 
   this plugin of the same Subversion branch will result in *exactly* the same 
   Bazaar branch.
@@ -78,18 +81,11 @@ Some bzr-svn specific issues are answered by the FAQ_.
 
 .. _FAQ: http://samba.org/~jelmer/bzr-svn/FAQ.html
 
-The way Bazaar metadata is stored in Subversion and the other way around is specified in the `mapping specification`_.
+The way Bazaar metadata is stored in Subversion and the other way around is 
+specified in the `mapping specification`_.
 
 .. _mapping specification: BzrForeignBranches/Subversion/mapping
 
-Support
--------
-Ask bzr-svn related questions on the `Bazaar mailing list`_ or in the 
-#bzr IRC channel on Freenode_.
-
-.. _Bazaar mailing list: http://lists.canonical.com/listinfo/bazaar/
-.. _Freenode: http://www.freenode.net/
-
 Limitations
 -----------
 
@@ -107,12 +103,13 @@ therefore ignored for the time being:
 
 - 'svn:eol-style'. Requires eol support in Bazaar.
 
-- 'svn:keywords'. Requires keywords support in Bazaar. Spec at https://launchpad.net/products/bzr/+spec/bzr-keyword-expansion. `#81463 <https://bugs.launchpad.net/bzr-svn/+bug/81463>`_
+- 'svn:keywords'. Requires keywords support in Bazaar. Spec at 
+  https://launchpad.net/products/bzr/+spec/bzr-keyword-expansion. 
+  `#81463 <https://bugs.launchpad.net/bzr-svn/+bug/81463>`_
 
 - 'svn:externals'. Externals should be mapped to Bazaar 'by-reference' 
   nested branches and the other way around. This can't be implemented 
-  this until Bazaars nested branch support lands. AaronBentley's work 
-  in progress is at http://code.aaronbentley.com/bzr/bzrrepo/nested-trees/.
+  until Bazaars nested branch support lands.
 
 
 Future Enhancements
@@ -129,10 +126,6 @@ In the future, I also hope to support:
 - use svn_ra_replay() when using servers that have Subversion 1.4. Saves a 
   couple of roundtrips when fetching history.
 
-- Shallow branches. Most of the existing Subversion repositories 
-  are quite large and it would therefore be nice to be able to limit 
-  the amount of history that needs to be retrieved during checkouts.
-
 Some Subversion properties can currently not be represented in Bazaar 
 and are therefore ignored for the time being:
 
@@ -150,36 +143,13 @@ Other features currently held back by Bazaars feature set:
    
   Spec at https://launchpad.net/products/bzr/+spec/bzr-cpick-data
 
-Requirements
-------------
-
-Bazaar
-~~~~~~
-
-You will need a recent version of Bazaar, usually the release of Bazaar 
-released in the same month as the release of bzr-svn you are using. bzr-svn 
-will warn if the Bazaar release used is too old or too new.
-
-SQLite
-~~~~~~
-
-If you are using Python 2.4, you will need to have the pysqlite module installed. Python 2.5 and higher have sqlite support built in. 
-
-Subversion development files
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-You need the Subversion libraries, including the development files. This should
-be readily packaged for most platforms. The package name for Debian 
-and Debian-based distributions is ``libsvn-dev``.
- 
-bzr-rebase
-~~~~~~~~~~
-
-In order to be able to use the ``svn-upgrade`` command (for those 
-who used versions of bzr-svn older than 0.4.0), you will need the `bzr-rebase`_ 
-plugin.
+Support
+-------
+Ask bzr-svn related questions on the `Bazaar mailing list`_ or in the 
+#bzr IRC channel on Freenode_.
 
-.. _bzr-rebase: http://bazaar-vcs.org/Rebase
+.. _Bazaar mailing list: http://lists.canonical.com/listinfo/bazaar/
+.. _Freenode: http://www.freenode.net/
 
 Bugs
 ----
@@ -189,25 +159,5 @@ https://launchpad.net/bzr-svn/.
 
 The wiki for this plugin is at http://bazaar-vcs.org/BzrForeignBranches/Subversion.
 
-Installation
-------------
-
-Simply place this directory in ~/.bazaar/plugins and you should be able 
-to check out branches from Subversion using bzr. Make sure the directory 
-name is 'svn'. The plugin has to be built as well by running ``make``.
-
-Development
------------
-
-Unit testing
-~~~~~~~~~~~~
-To run the bzr-svn testsuite, simply run 'bzr selftest svn'
-
-Credits
--------
-bzr-svn was written by JelmerVernooij_ with the help from various other people. See the AUTHORS file for a full list of contributors.
-
-.. _JelmerVernooij: http://samba.org/~jelmer/
-
 ..
        vim: ft=rest