Rev 3423: (jam) merge 1.5rc1 back into bzr.dev, and update bzr.dev's versions in file:///home/pqm/archives/thelove/bzr/%2Btrunk/
Canonical.com Patch Queue Manager
pqm at pqm.ubuntu.com
Sat May 10 14:43:18 BST 2008
At file:///home/pqm/archives/thelove/bzr/%2Btrunk/
------------------------------------------------------------
revno: 3423
revision-id:pqm at pqm.ubuntu.com-20080510134309-4y3tppe4u5fdw13z
parent: pqm at pqm.ubuntu.com-20080509210507-jcb0uvu1htlnnouy
parent: john at arbash-meinel.com-20080510113332-ax3i85t7hhbuorje
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Sat 2008-05-10 14:43:09 +0100
message:
(jam) merge 1.5rc1 back into bzr.dev, and update bzr.dev's versions
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzr bzr.py-20050313053754-5485f144c7006fa6
bzrlib/__init__.py __init__.py-20050309040759-33e65acf91bbcd5d
bzrlib/symbol_versioning.py symbol_versioning.py-20060105104851-9ecf8af605d15a80
------------------------------------------------------------
revno: 3422.1.2
revision-id:john at arbash-meinel.com-20080510113332-ax3i85t7hhbuorje
parent: john at arbash-meinel.com-20080510031356-keo9r2fv4gtr1uek
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: jam-integration
timestamp: Sat 2008-05-10 06:33:32 -0500
message:
Update version in 'bzr' and 'bzrlib/__init__.py'
modified:
bzr bzr.py-20050313053754-5485f144c7006fa6
bzrlib/__init__.py __init__.py-20050309040759-33e65acf91bbcd5d
bzrlib/symbol_versioning.py symbol_versioning.py-20060105104851-9ecf8af605d15a80
------------------------------------------------------------
revno: 3422.1.1
revision-id:john at arbash-meinel.com-20080510031356-keo9r2fv4gtr1uek
parent: pqm at pqm.ubuntu.com-20080509210507-jcb0uvu1htlnnouy
parent: pqm at pqm.ubuntu.com-20080510010654-pgstnjcvu71q7cxo
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: jam-integration
timestamp: Fri 2008-05-09 22:13:56 -0500
message:
merge in bzr-1.5rc1, revert the transaction cache change
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/__init__.py __init__.py-20050309040759-33e65acf91bbcd5d
------------------------------------------------------------
revno: 3418.6.3
revision-id:pqm at pqm.ubuntu.com-20080510010654-pgstnjcvu71q7cxo
parent: pqm at pqm.ubuntu.com-20080509234639-4ids7i4sax9i0yiw
parent: john at arbash-meinel.com-20080509202105-fov30w15vbr0wctp
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: 1.5
timestamp: Sat 2008-05-10 02:06:54 +0100
message:
(jam) Prepare 1.5rc1 release.
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/__init__.py __init__.py-20050309040759-33e65acf91bbcd5d
------------------------------------------------------------
revno: 3421.1.1
revision-id:john at arbash-meinel.com-20080509202105-fov30w15vbr0wctp
parent: pqm at pqm.ubuntu.com-20080509190952-oqlrpkxzoruxymko
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: 1.5-version
timestamp: Fri 2008-05-09 15:21:05 -0500
message:
(jam) Prepare 1.5rc1 release.
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/__init__.py __init__.py-20050309040759-33e65acf91bbcd5d
------------------------------------------------------------
revno: 3418.6.2
revision-id:pqm at pqm.ubuntu.com-20080509234639-4ids7i4sax9i0yiw
parent: pqm at pqm.ubuntu.com-20080509222618-5za5xl5xvzec8d6r
parent: robertc at robertcollins.net-20080417033213-ve179c1ud7brur7c
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: 1.5
timestamp: Sat 2008-05-10 00:46:39 +0100
message:
Reinstate the transaction cache for bzr 1.5rc1
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/fetch.py fetch.py-20050818234941-26fea6105696365d
bzrlib/repository.py rev_storage.py-20051111201905-119e9401e46257e3
bzrlib/store/versioned/__init__.py weavestore.py-20050907094258-88262e0434babab9
bzrlib/tests/test_fetch.py testfetch.py-20050825090644-f73e07e7dfb1765a
bzrlib/tests/test_store.py teststore.py-20050826022702-f6caadb647395769
------------------------------------------------------------
revno: 3365.2.1
revision-id:robertc at robertcollins.net-20080417033213-ve179c1ud7brur7c
parent: pqm at pqm.ubuntu.com-20080413194429-a5e4pft9sffa2ycu
committer: Robert Collins <robertc at robertcollins.net>
branch nick: reinstate-transaction-cache
timestamp: Thu 2008-04-17 13:32:13 +1000
message:
Back out transaction cache removal.
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/fetch.py fetch.py-20050818234941-26fea6105696365d
bzrlib/repository.py rev_storage.py-20051111201905-119e9401e46257e3
bzrlib/store/versioned/__init__.py weavestore.py-20050907094258-88262e0434babab9
bzrlib/tests/test_fetch.py testfetch.py-20050825090644-f73e07e7dfb1765a
bzrlib/tests/test_store.py teststore.py-20050826022702-f6caadb647395769
------------------------------------------------------------
revno: 3418.6.1
revision-id:pqm at pqm.ubuntu.com-20080509222618-5za5xl5xvzec8d6r
parent: pqm at pqm.ubuntu.com-20080508230313-knn3ibom6wt27w5k
parent: pqm at pqm.ubuntu.com-20080509210507-jcb0uvu1htlnnouy
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: 1.5
timestamp: Fri 2008-05-09 23:26:18 +0100
message:
Merge the latest bzr.dev
added:
doc/en/user-guide/bzrtools_plugin.txt bzrtools_plugin.txt-20080509065016-cjc90f46407vi9a0-1
doc/en/user-guide/svn_plugin.txt svn_plugin.txt-20080509065016-cjc90f46407vi9a0-2
doc/en/user-guide/web_browsing.txt web_browsing.txt-20080509065016-cjc90f46407vi9a0-3
renamed:
doc/en/user-guide/best_practice_intro.txt => doc/en/user-guide/part2_intro.txt best_practice_intro.-20071123154453-dk2mjhrg1vpjm5w2-1
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/config.py config.py-20051011043216-070c74f4e9e338e8
bzrlib/help_topics/en/authentication.txt authentication_conf.-20071104135035-glfv0ri355tyg1nf-1
bzrlib/tests/test_config.py testconfig.py-20051011041908-742d0c15d8d8c8eb
doc/developers/authentication-ring.txt authring.txt-20070718200437-q5tdik0ne6lor86d-1
doc/developers/index.txt index.txt-20070508041241-qznziunkg0nffhiw-1
doc/en/user-guide/bug_trackers.txt bug_trackers.txt-20070713223459-khxdlcudraii95uv-1
doc/en/user-guide/configuring_bazaar.txt configuring_bazaar.t-20071128000722-ncxiua259xwbdbg7-1
doc/en/user-guide/index.txt index.txt-20060622101119-tgwtdci8z769bjb9-2
doc/en/user-guide/introducing_bazaar.txt introducing_bazaar.t-20071114035000-q36a9h57ps06uvnl-5
doc/en/user-guide/part2_intro.txt best_practice_intro.-20071123154453-dk2mjhrg1vpjm5w2-1
=== modified file 'NEWS'
--- a/NEWS 2008-05-09 21:05:07 +0000
+++ b/NEWS 2008-05-10 03:13:56 +0000
@@ -12,6 +12,29 @@
CHANGES:
+ FEATURES:
+
+ IMPROVEMENTS:
+
+ BUGFIXES:
+
+ DOCUMENTATION:
+
+ TESTING:
+
+ INTERNALS:
+
+
+ API BREAKS:
+
+
+bzr 1.5rc1 2008-05-09
+---------------------
+
+ NOTES WHEN UPGRADING:
+
+ CHANGES:
+
* Broader support of GNU Emacs mail clients. Set
``mail_client=emacsclient`` in your bazaar.conf and ``send`` will pop the
bundle in a mail buffer according to the value of ``mail-user-agent``
=== modified file 'bzr'
--- a/bzr 2008-05-02 05:43:54 +0000
+++ b/bzr 2008-05-10 11:33:32 +0000
@@ -22,7 +22,7 @@
import sys
# update this on each release
-_script_version = (1, 5, 0)
+_script_version = (1, 6, 0)
if __doc__ is None:
print "bzr does not support python -OO."
=== modified file 'bzrlib/__init__.py'
--- a/bzrlib/__init__.py 2008-05-02 11:53:00 +0000
+++ b/bzrlib/__init__.py 2008-05-10 11:33:32 +0000
@@ -41,7 +41,7 @@
# Python version 2.0 is (2, 0, 0, 'final', 0)." Additionally we use a
# releaselevel of 'dev' for unreleased under-development code.
-version_info = (1, 5, 0, 'dev', 0)
+version_info = (1, 6, 0, 'dev', 0)
# API compatibility version: bzrlib is currently API compatible with 0.18.
=== modified file 'bzrlib/symbol_versioning.py'
--- a/bzrlib/symbol_versioning.py 2008-05-02 07:31:24 +0000
+++ b/bzrlib/symbol_versioning.py 2008-05-10 11:33:32 +0000
@@ -50,6 +50,7 @@
'one_three',
'one_four',
'one_five',
+ 'one_six',
]
from warnings import warn
@@ -80,6 +81,7 @@
one_three = "%s was deprecated in version 1.3."
one_four = "%s was deprecated in version 1.4."
one_five = "%s was deprecated in version 1.5."
+one_six = "%s was deprecated in version 1.6."
def deprecated_in(version_tuple):
More information about the bazaar-commits
mailing list