Rev 1185: Merge 0.4. in file:///data/jelmer/bzr-svn/dpush/

[Jelmer Vernooij]

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

------------------------------------------------------------
revno: 1185
revision-id: jelmer at samba.org-20080628234728-sg6urj2iqxraiiik
parent: jelmer at samba.org-20080628173931-gpuo7fj9xcog50ou
parent: jelmer at samba.org-20080628185557-wqhpawbqrd3041n6
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: dpush
timestamp: Sun 2008-06-29 01:47:28 +0200
message:
  Merge 0.4.
modified:
  NEWS                           news-20061231030336-h9fhq245ie0de8bs-1
  README                         README-20051120210643-bd274a2fef9aed6a
  __init__.py                    __init__.py-20051008155114-eae558e6cf149e1d
    ------------------------------------------------------------
    revno: 1177.10.4
    revision-id: jelmer at samba.org-20080628185557-wqhpawbqrd3041n6
    parent: jelmer at samba.org-20080628160723-5wumjiiebuytlzug
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: 0.4
    timestamp: Sat 2008-06-28 20:55:57 +0200
    message:
      Import BzrError early.
    modified:
      __init__.py                    __init__.py-20051008155114-eae558e6cf149e1d
    ------------------------------------------------------------
    revno: 1177.10.3
    revision-id: jelmer at samba.org-20080628160723-5wumjiiebuytlzug
    parent: jelmer at samba.org-20080628123728-0lqgtvhe8424ha8j
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: 0.4
    timestamp: Sat 2008-06-28 18:07:23 +0200
    message:
      Fix formatting in README, add note about stacked branches.
    modified:
      NEWS                           news-20061231030336-h9fhq245ie0de8bs-1
      README                         README-20051120210643-bd274a2fef9aed6a
=== modified file 'NEWS'
--- a/NEWS	2008-06-27 18:23:06 +0000
+++ b/NEWS	2008-06-28 23:47:28 +0000
@@ -20,6 +20,8 @@
 
    * Now uses absolute imports and no longer adds plugin directory to the system path.
 
+   * Basic support for stacked branches.
+
   FEATURES
   
    * Add new "dpush" command that works similar to git-svn's dcommit.

=== modified file 'README'
--- a/README	2008-06-22 08:09:10 +0000
+++ b/README	2008-06-28 16:07:23 +0000
@@ -53,7 +53,8 @@
 
 .. _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/
 
@@ -78,7 +79,8 @@
 
 .. _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
 
@@ -107,7 +109,9 @@
 
 - '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 
@@ -129,10 +133,6 @@
 - 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:
 
@@ -163,14 +163,15 @@
 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. 
+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``.
+and Debian-based distributions such as Ubuntu is ``libsvn-dev``. 
  
 bzr-rebase
 ~~~~~~~~~~
@@ -205,7 +206,8 @@
 
 Credits
 -------
-bzr-svn was written by JelmerVernooij_ with the help from various other people. See the AUTHORS file for a full list of contributors.
+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/
 

=== modified file '__init__.py'
--- a/__init__.py	2008-06-28 16:01:51 +0000
+++ b/__init__.py	2008-06-28 23:47:28 +0000
@@ -19,6 +19,7 @@
 """
 import bzrlib
 from bzrlib.bzrdir import BzrDirFormat, format_registry
+from bzrlib.errors import BzrError
 from bzrlib.commands import Command, register_command, display_command, Option
 from bzrlib.help_topics import topic_registry
 from bzrlib.revisionspec import SPEC_TYPES
@@ -54,7 +55,6 @@
         ((bzrlib_version[0], bzrlib_version[1]-1) in desired and 
          bzrlib.version_info[3] == 'dev')):
         return
-    from bzrlib.errors import BzrError
     if bzrlib_version < desired[0]:
         raise BzrError('Installed bzr version %s is too old to be used with bzr-svn, at least %s.%s required' % (bzrlib.__version__, desired[0][0], desired[0][1]))
     else: