Rev 433: Merge 0.3.2 in http://people.samba.org/bzr/jelmer/bzr-svn/bzr.dev
Jelmer Vernooij
jelmer at samba.org
Mon Mar 19 15:55:39 GMT 2007
At http://people.samba.org/bzr/jelmer/bzr-svn/bzr.dev
------------------------------------------------------------
revno: 433
revision-id: jelmer at samba.org-20070313143505-59evkrfikl4aoa56
parent: jelmer at samba.org-20070313002403-57ghh1n3sqrurjtr
parent: jelmer at samba.org-20070313100558-tfdjo5ar8fzhuoy9
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: main
timestamp: Tue 2007-03-13 15:35:05 +0100
message:
Merge 0.3.2
modified:
NEWS news-20061231030336-h9fhq245ie0de8bs-1
TODO todo-20060729211917-2kpobww0zyvvo0j2-1
__init__.py __init__.py-20051008155114-eae558e6cf149e1d
branch.py svnbranch.py-20051017135706-11c749eb0dab04a7
branchprops.py branchprops.py-20061223204623-80lvm7pjrpsgk0dd-1
checkout.py workingtree.py-20060306120941-b083cb0fdd4a69de
commit.py commit.py-20060607190346-qvq128wgfubhhgm2-1
convert.py svn2bzr.py-20051018015439-cb4563bff29e632d
errors.py errors.py-20061226172623-w1sbj8ynpo0eojqp-1
format.py format.py-20060406233823-b6fa009fe35dfde7
tests/__init__.py __init__.py-20060508151940-e9f4d914801a2535
tests/test_branch.py test_branch.py-20060508162215-74ffeb5d608f8e20
tests/test_branchprops.py test_branchprops.py-20061223210444-04xf5224zcg69m3w-1
tests/test_checkout.py test_checkout.py-20070101154110-eevkc29qj0q7udz5-1
tests/test_commit.py test_commit.py-20060624213521-l5kcufywkh9mnilk-1
tests/test_convert.py test_convert.py-20060705203611-b1l0bapeku6foco0-1
tests/test_fileids.py test_fileids.py-20060622131341-19gyrlgqy8yl2od5-1
tests/test_logwalker.py test_logwalker.py-20060622141944-pkocc3rj8g62ukbi-1
tests/test_radir.py test_radir.py-20061231173434-31utf9o4byu7wktm-1
tests/test_repos.py test_repos.py-20060508151940-ddc49a59257ca712
tests/test_scheme.py test_scheme.py-20060621221855-va2xabhlxpmc9llx-1
tests/test_transport.py test_transport.py-20060621232111-xh7xvoblzsrgj79t-1
------------------------------------------------------------
revno: 402.1.29
merged: jelmer at samba.org-20070313100558-tfdjo5ar8fzhuoy9
parent: jelmer at samba.org-20070313094214-nz3rhuhp8spxhrq7
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: 0.3
timestamp: Tue 2007-03-13 11:05:58 +0100
message:
Fill in release date.
------------------------------------------------------------
revno: 402.1.28
merged: jelmer at samba.org-20070313094214-nz3rhuhp8spxhrq7
parent: jelmer at samba.org-20070313094012-82e1acd6v06p91iv
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: 0.3
timestamp: Tue 2007-03-13 10:42:14 +0100
message:
Update TODO
------------------------------------------------------------
revno: 402.1.27
merged: jelmer at samba.org-20070313094012-82e1acd6v06p91iv
parent: jelmer at samba.org-20070313001750-tjw1x4m48updphg6
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: 0.3
timestamp: Tue 2007-03-13 10:40:12 +0100
message:
Update year
=== modified file 'NEWS'
--- a/NEWS 2007-03-13 00:24:03 +0000
+++ b/NEWS 2007-03-13 14:35:05 +0000
@@ -1,5 +1,5 @@
bzr-svn 0.4 UNRELEASED
-
+
BUG FIXES
* Non-ascii characters in file ids are now supported (fixes imports
@@ -18,18 +18,18 @@
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.
-
PERFORMANCE
* do_update() is now used to find the contents of a directory recursively.
This should reduce the number of roundtrips significantly when
finding file id mappings.
+bzr-svn 0.3.2 2007-03-13
+
+ BUG FIXES
+
+ * Fix compatibility with Bazaar 0.15.
+
* Check for parent paths moving as well in LogWalker.find_latest_change().
Fixes #84087.
=== modified file 'TODO'
--- a/TODO 2007-03-13 00:24:03 +0000
+++ b/TODO 2007-03-13 14:35:05 +0000
@@ -12,7 +12,6 @@
- make ListBranchingScheme() support wildcards
- rewrite TrunkBranchingScheme() and ListBranchingScheme() as subclasses of
ListBranchingScheme()
-- support multiple branching schemes per repository
- more efficient implementation for applying txdeltas to weaves. perhaps convert svn deltas to bzr deltas?
- free memory!
- implement BzrDirFormat.get_converter()
=== modified file '__init__.py'
--- a/__init__.py 2007-03-08 18:48:56 +0000
+++ b/__init__.py 2007-03-13 14:35:05 +0000
@@ -1,4 +1,4 @@
-# Copyright (C) 2005-2006 Jelmer Vernooij <jelmer at samba.org>
+# Copyright (C) 2005-2007 Jelmer Vernooij <jelmer at samba.org>
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
=== modified file 'branch.py'
--- a/branch.py 2007-03-13 00:24:03 +0000
+++ b/branch.py 2007-03-13 14:35:05 +0000
@@ -1,4 +1,4 @@
-# Copyright (C) 2005-2006 Jelmer Vernooij <jelmer at samba.org>
+# Copyright (C) 2005-2007 Jelmer Vernooij <jelmer at samba.org>
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
=== modified file 'branchprops.py'
--- a/branchprops.py 2007-03-04 01:15:48 +0000
+++ b/branchprops.py 2007-03-13 14:35:05 +0000
@@ -1,4 +1,4 @@
-# Copyright (C) 2006 Jelmer Vernooij <jelmer at samba.org>
+# Copyright (C) 2006-2007 Jelmer Vernooij <jelmer at samba.org>
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
=== modified file 'checkout.py'
--- a/checkout.py 2007-03-13 00:24:03 +0000
+++ b/checkout.py 2007-03-13 14:35:05 +0000
@@ -1,4 +1,4 @@
-# Copyright (C) 2005-2006 Jelmer Vernooij <jelmer at samba.org>
+# Copyright (C) 2005-2007 Jelmer Vernooij <jelmer at samba.org>
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
=== modified file 'commit.py'
--- a/commit.py 2007-03-13 00:24:03 +0000
+++ b/commit.py 2007-03-13 14:35:05 +0000
@@ -1,4 +1,4 @@
-# Copyright (C) 2006 Jelmer Vernooij <jelmer at samba.org>
+# Copyright (C) 2006-2007 Jelmer Vernooij <jelmer at samba.org>
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
=== modified file 'convert.py'
--- a/convert.py 2007-03-13 00:24:03 +0000
+++ b/convert.py 2007-03-13 14:35:05 +0000
@@ -1,4 +1,4 @@
-# Copyright (C) 2005-2006 by Jelmer Vernooij
+# Copyright (C) 2005-2007 by Jelmer Vernooij
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
=== modified file 'errors.py'
--- a/errors.py 2007-01-31 12:54:40 +0000
+++ b/errors.py 2007-03-13 14:35:05 +0000
@@ -1,4 +1,4 @@
-# Copyright (C) 2006 Jelmer Vernooij <jelmer at samba.org>
+# Copyright (C) 2007 Jelmer Vernooij <jelmer at samba.org>
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
=== modified file 'format.py'
--- a/format.py 2007-01-18 13:19:14 +0000
+++ b/format.py 2007-03-13 14:35:05 +0000
@@ -1,4 +1,4 @@
-# Copyright (C) 2006 Jelmer Vernooij <jelmer at samba.org>
+# Copyright (C) 2006-2007 Jelmer Vernooij <jelmer at samba.org>
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
=== modified file 'tests/__init__.py'
--- a/tests/__init__.py 2007-02-02 19:48:10 +0000
+++ b/tests/__init__.py 2007-03-13 14:35:05 +0000
@@ -1,4 +1,4 @@
-# Copyright (C) 2006 Jelmer Vernooij <jelmer at samba.org>
+# Copyright (C) 2006-2007 Jelmer Vernooij <jelmer at samba.org>
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
=== modified file 'tests/test_branch.py'
--- a/tests/test_branch.py 2007-01-10 03:59:17 +0000
+++ b/tests/test_branch.py 2007-03-13 14:35:05 +0000
@@ -1,4 +1,4 @@
-# Copyright (C) 2006 Jelmer Vernooij <jelmer at samba.org>
+# Copyright (C) 2006-2007 Jelmer Vernooij <jelmer at samba.org>
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
=== modified file 'tests/test_branchprops.py'
--- a/tests/test_branchprops.py 2007-01-03 07:13:12 +0000
+++ b/tests/test_branchprops.py 2007-03-13 09:40:12 +0000
@@ -1,4 +1,4 @@
-# Copyright (C) 2006 Jelmer Vernooij <jelmer at samba.org>
+# Copyright (C) 2006-2007 Jelmer Vernooij <jelmer at samba.org>
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
=== modified file 'tests/test_checkout.py'
--- a/tests/test_checkout.py 2007-01-02 02:39:36 +0000
+++ b/tests/test_checkout.py 2007-03-13 09:40:12 +0000
@@ -1,4 +1,4 @@
-# Copyright (C) 2006 Jelmer Vernooij <jelmer at samba.org>
+# Copyright (C) 2006-2007 Jelmer Vernooij <jelmer at samba.org>
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
=== modified file 'tests/test_commit.py'
--- a/tests/test_commit.py 2007-03-12 23:49:11 +0000
+++ b/tests/test_commit.py 2007-03-13 09:40:12 +0000
@@ -1,4 +1,4 @@
-# Copyright (C) 2006 Jelmer Vernooij <jelmer at samba.org>
+# Copyright (C) 2006-2007 Jelmer Vernooij <jelmer at samba.org>
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
=== modified file 'tests/test_convert.py'
--- a/tests/test_convert.py 2007-02-02 14:13:32 +0000
+++ b/tests/test_convert.py 2007-03-13 14:35:05 +0000
@@ -1,4 +1,4 @@
-# Copyright (C) 2006 Jelmer Vernooij <jelmer at samba.org>
+# Copyright (C) 2006-2007 Jelmer Vernooij <jelmer at samba.org>
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
=== modified file 'tests/test_fileids.py'
--- a/tests/test_fileids.py 2007-03-13 00:24:03 +0000
+++ b/tests/test_fileids.py 2007-03-13 14:35:05 +0000
@@ -1,4 +1,4 @@
-# Copyright (C) 2006 Jelmer Vernooij <jelmer at samba.org>
+# Copyright (C) 2006-2007 Jelmer Vernooij <jelmer at samba.org>
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
=== modified file 'tests/test_logwalker.py'
--- a/tests/test_logwalker.py 2007-03-11 22:58:39 +0000
+++ b/tests/test_logwalker.py 2007-03-13 09:40:12 +0000
@@ -1,4 +1,4 @@
-# Copyright (C) 2006 Jelmer Vernooij <jelmer at samba.org>
+# Copyright (C) 2006-2007 Jelmer Vernooij <jelmer at samba.org>
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
=== modified file 'tests/test_radir.py'
--- a/tests/test_radir.py 2007-01-02 02:39:36 +0000
+++ b/tests/test_radir.py 2007-03-13 09:40:12 +0000
@@ -1,4 +1,4 @@
-# Copyright (C) 2006 Jelmer Vernooij <jelmer at samba.org>
+# Copyright (C) 2006-2007 Jelmer Vernooij <jelmer at samba.org>
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
=== modified file 'tests/test_repos.py'
--- a/tests/test_repos.py 2007-03-13 00:24:03 +0000
+++ b/tests/test_repos.py 2007-03-13 14:35:05 +0000
@@ -1,4 +1,4 @@
-# Copyright (C) 2006 Jelmer Vernooij <jelmer at samba.org>
+# Copyright (C) 2006-2007 Jelmer Vernooij <jelmer at samba.org>
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
=== modified file 'tests/test_scheme.py'
--- a/tests/test_scheme.py 2007-01-18 13:19:14 +0000
+++ b/tests/test_scheme.py 2007-03-13 14:35:05 +0000
@@ -1,4 +1,4 @@
-# Copyright (C) 2006 Jelmer Vernooij <jelmer at samba.org>
+# Copyright (C) 2006-2007 Jelmer Vernooij <jelmer at samba.org>
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
=== modified file 'tests/test_transport.py'
--- a/tests/test_transport.py 2007-01-02 02:39:36 +0000
+++ b/tests/test_transport.py 2007-03-13 09:40:12 +0000
@@ -1,4 +1,4 @@
-# Copyright (C) 2006 Jelmer Vernooij <jelmer at samba.org>
+# Copyright (C) 2006-2007 Jelmer Vernooij <jelmer at samba.org>
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
More information about the bazaar-commits
mailing list