Rev 429: Merge fixes from 0.3 branch. in http://people.samba.org/bzr/jelmer/bzr-svn/bzr.dev
Jelmer Vernooij
jelmer at samba.org
Sun Mar 4 01:16:21 GMT 2007
At http://people.samba.org/bzr/jelmer/bzr-svn/bzr.dev
------------------------------------------------------------
revno: 429
revision-id: jelmer at samba.org-20070304011548-vmqlcoqes9gmd0pi
parent: jelmer at samba.org-20070304010912-c2lku185on728s02
parent: jelmer at samba.org-20070210134644-yh0z59tdetv4qfcj
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: main
timestamp: Sun 2007-03-04 02:15:48 +0100
message:
Merge fixes from 0.3 branch.
modified:
NEWS news-20061231030336-h9fhq245ie0de8bs-1
__init__.py __init__.py-20051008155114-eae558e6cf149e1d
setup.py setup.py-20060502115218-86950492da22353f
------------------------------------------------------------
revno: 402.1.12
merged: jelmer at samba.org-20070210134644-yh0z59tdetv4qfcj
parent: jelmer at samba.org-20070131130828-jk3tbipjwu68cyad
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: 0.3
timestamp: Sat 2007-02-10 14:46:44 +0100
message:
Add some more assertions.
------------------------------------------------------------
revno: 402.1.11
merged: jelmer at samba.org-20070131130828-jk3tbipjwu68cyad
parent: jelmer at samba.org-20070131130501-axscb3hqivrlem80
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: 0.3
timestamp: Wed 2007-01-31 14:08:28 +0100
message:
Change compatibility back to 0.14
------------------------------------------------------------
revno: 402.1.10
merged: jelmer at samba.org-20070131130501-axscb3hqivrlem80
parent: jelmer at samba.org-20070124142002-rbqv3bbu1kzf6xpu
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: 0.3
timestamp: Wed 2007-01-31 14:05:01 +0100
message:
Prepare for 0.3.1
------------------------------------------------------------
revno: 402.1.9
merged: jelmer at samba.org-20070124142002-rbqv3bbu1kzf6xpu
parent: jelmer at samba.org-20070124125822-cnzucxd5i9nhmgvy
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: 0.3
timestamp: Wed 2007-01-24 15:20:02 +0100
message:
Warn about versions of sqlite that are too old.
------------------------------------------------------------
revno: 402.1.8
merged: jelmer at samba.org-20070124125822-cnzucxd5i9nhmgvy
parent: jelmer at samba.org-20070120193547-uaovrc0qedo1q76x
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: 0.3
timestamp: Wed 2007-01-24 13:58:22 +0100
message:
Fix warning, thanks metze
------------------------------------------------------------
revno: 402.1.7
merged: jelmer at samba.org-20070120193547-uaovrc0qedo1q76x
parent: jelmer at samba.org-20070120160640-9ugp4ouw4cjohbew
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: 0.3
timestamp: Sat 2007-01-20 20:35:47 +0100
message:
Remove unused code, fix import
------------------------------------------------------------
revno: 402.1.6
merged: jelmer at samba.org-20070120160640-9ugp4ouw4cjohbew
parent: jelmer at samba.org-20070120131357-68vd9qrqm8kip49m
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: 0.3
timestamp: Sat 2007-01-20 17:06:40 +0100
message:
Update NEWS
------------------------------------------------------------
revno: 402.1.5
merged: jelmer at samba.org-20070120131357-68vd9qrqm8kip49m
parent: jelmer at samba.org-20070119181806-zaqx8bkxnhycrxri
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: 0.3
timestamp: Sat 2007-01-20 14:13:57 +0100
message:
Warn about outdated subversion versions.
------------------------------------------------------------
revno: 402.1.4
merged: jelmer at samba.org-20070119181806-zaqx8bkxnhycrxri
parent: jelmer at samba.org-20070118193947-xql1atdnvjhvbvrt
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: 0.3
timestamp: Fri 2007-01-19 19:18:06 +0100
message:
Add check for pysqlite version
------------------------------------------------------------
revno: 402.1.3
merged: jelmer at samba.org-20070118193947-xql1atdnvjhvbvrt
parent: jelmer at samba.org-20070116035605-h2kb6hlr8ycht9ag
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: 0.3
timestamp: Thu 2007-01-18 20:39:47 +0100
message:
Merge BzrError fix from Wouter.
------------------------------------------------------------
revno: 402.1.2
merged: jelmer at samba.org-20070116035605-h2kb6hlr8ycht9ag
parent: jelmer at samba.org-20070116024303-0yftv4huvat2el1l
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: 0.3
timestamp: Tue 2007-01-16 04:56:05 +0100
message:
Remove failing tests
------------------------------------------------------------
revno: 402.1.1
merged: jelmer at samba.org-20070116024303-0yftv4huvat2el1l
parent: jelmer at samba.org-20070116013721-adqxlwj1dl5jo7as
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: 0.3
timestamp: Tue 2007-01-16 03:43:03 +0100
message:
Prepare for 0.3
=== modified file 'NEWS'
--- a/NEWS 2007-02-02 19:48:10 +0000
+++ b/NEWS 2007-03-04 01:15:48 +0000
@@ -31,7 +31,22 @@
finding file id mappings.
-bzr-svn 0.3 2007-01-16
+bzr-svn 0.3.1 2007-01-31
+
+ BUG FIXES
+
+ * Warning given when the version of python-subversion is not patched
+ is now fixed. (Wouter van Heyst)
+
+ IMPROVEMENTS
+
+ * A proper warning will now be printed if no sqlite implementation is
+ available.
+
+ * Working tree copies will be disabled if the version of python-subversion
+ is too old.
+
+bzr-svn 0.3.0 2007-01-16
BUG FIXES
=== modified file '__init__.py'
--- a/__init__.py 2007-01-29 15:19:34 +0000
+++ b/__init__.py 2007-03-04 01:15:48 +0000
@@ -28,7 +28,7 @@
# get the message out any way we can
from warnings import warn as warning
-__version__ = '0.3.0'
+__version__ = '0.3.1'
required_bzr_version = (0,15)
def check_bzrlib_version(desired):
@@ -110,6 +110,7 @@
subr_version = svn.core.svn_subr_version()
if subr_version.major == 1 and subr_version.minor < 4:
+ from bzrlib.trace import warning
warning('Subversion version too old for working tree support.')
else:
BzrDirFormat.register_control_format(checkout.SvnWorkingTreeDirFormat)
=== modified file 'setup.py'
--- a/setup.py 2006-10-16 10:38:22 +0000
+++ b/setup.py 2007-01-31 13:05:01 +0000
@@ -5,7 +5,7 @@
setup(name='bzr-svn',
description='Support for Subversion branches in Bazaar-NG',
keywords='plugin bzr svn',
- version='0.2',
+ version='0.3.1',
url='http://bazaar-vcs.org/BzrForeignBranches/Subversion',
download_url='http://bazaar-vcs.org/BzrSvn',
license='GPL',
More information about the bazaar-commits
mailing list