Rev 1917: Merge 0.4. in file:///data/jelmer/bzr-svn/trunk/

[Jelmer Vernooij]

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

------------------------------------------------------------
revno: 1917
revision-id: jelmer at samba.org-20080928201625-2bumgl48eac53dll
parent: jelmer at samba.org-20080921221936-zd6rmu2mkno82bvm
parent: jelmer at samba.org-20080924160138-uvnoloi6cvo72y1c
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: trunk
timestamp: Sun 2008-09-28 22:16:25 +0200
message:
  Merge 0.4.
modified:
  FAQ                            faq-20070910195147-p9u38s9wplds2d4o-1
  NEWS                           news-20061231030336-h9fhq245ie0de8bs-1
    ------------------------------------------------------------
    revno: 1669.1.51
    revision-id: jelmer at samba.org-20080924160138-uvnoloi6cvo72y1c
    parent: jelmer at samba.org-20080924160103-8eaf0uaujrsnz7he
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: 0.4
    timestamp: Wed 2008-09-24 18:01:38 +0200
    message:
      Start working on 0.4.14.
    modified:
      NEWS                           news-20061231030336-h9fhq245ie0de8bs-1
      __init__.py                    __init__.py-20051008155114-eae558e6cf149e1d
      setup.py                       setup.py-20060502115218-86950492da22353f
    ------------------------------------------------------------
    revno: 1669.1.50
    tags: bzr-svn-0.4.13
    revision-id: jelmer at samba.org-20080924160103-8eaf0uaujrsnz7he
    parent: jelmer at samba.org-20080923165728-7568c2gayb0rexnr
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: 0.4
    timestamp: Wed 2008-09-24 18:01:03 +0200
    message:
      Release 0.4.13.
    modified:
      NEWS                           news-20061231030336-h9fhq245ie0de8bs-1
      __init__.py                    __init__.py-20051008155114-eae558e6cf149e1d
    ------------------------------------------------------------
    revno: 1669.1.49
    revision-id: jelmer at samba.org-20080923165728-7568c2gayb0rexnr
    parent: jelmer at samba.org-20080921221845-cjr9vjqsy3tf99nh
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: 0.4
    timestamp: Tue 2008-09-23 18:57:28 +0200
    message:
      Fix option name.
    modified:
      FAQ                            faq-20070910195147-p9u38s9wplds2d4o-1
=== modified file 'FAQ'
--- a/FAQ	2008-08-31 13:44:01 +0000
+++ b/FAQ	2008-09-28 20:16:25 +0000
@@ -103,7 +103,7 @@
  Pushed up to revision 1075.
 
 If you would like to forbid Bazaar from ever doing these replace operations, set the 
-``append-revisions-only`` setting to True for the repository you're 
+``append_revisions_only`` setting to True for the repository you're 
 pushing to.
 
 bzr-svn sets all kinds of file properties when pushing revisions into Subversion. Is this really necessary?

=== modified file 'NEWS'
--- a/NEWS	2008-09-21 13:31:05 +0000
+++ b/NEWS	2008-09-28 20:16:25 +0000
@@ -58,7 +58,7 @@
 
     + Standard commit code provides commit notification. (#79333)
 
-bzr-svn 0.4.13	UNRELEASED
+bzr-svn 0.4.13	2008-09-24
 
   BUG FIXES
 
@@ -72,6 +72,8 @@
 
    * Properly convert errors raised when starting a commit. (#267899)
 
+   * Fix compatibility with Bazaar 1.7.
+
   FEATURES
 
    * Add support for using Apple keychain.