Rev 4439: (jml) Merge 1.16rc1 back into trunk, updating NEWS and version number. in file:///home/pqm/archives/thelove/bzr/%2Btrunk/
Canonical.com Patch Queue Manager
pqm at pqm.ubuntu.com
Fri Jun 12 10:42:11 BST 2009
At file:///home/pqm/archives/thelove/bzr/%2Btrunk/
------------------------------------------------------------
revno: 4439
revision-id: pqm at pqm.ubuntu.com-20090612094207-jk5dodjd19e9h2hk
parent: pqm at pqm.ubuntu.com-20090612034412-oi5ll5wrbarb2w7s
parent: jml at canonical.com-20090612084438-0qxjx2g1j70nz5rm
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Fri 2009-06-12 10:42:07 +0100
message:
(jml) Merge 1.16rc1 back into trunk, updating NEWS and version number.
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzr bzr.py-20050313053754-5485f144c7006fa6
bzrlib/__init__.py __init__.py-20050309040759-33e65acf91bbcd5d
------------------------------------------------------------
revno: 4438.1.4
revision-id: jml at canonical.com-20090612084438-0qxjx2g1j70nz5rm
parent: jml at canonical.com-20090612083944-vx8tkljj3vzh3gxp
committer: Jonathan Lange <jml at canonical.com>
branch nick: merge-back-1.16rc1
timestamp: Fri 2009-06-12 18:44:38 +1000
message:
Update script_version.
modified:
bzr bzr.py-20050313053754-5485f144c7006fa6
------------------------------------------------------------
revno: 4438.1.3
revision-id: jml at canonical.com-20090612083944-vx8tkljj3vzh3gxp
parent: jml at canonical.com-20090612083852-031puj7kgdklls2i
committer: Jonathan Lange <jml at canonical.com>
branch nick: merge-back-1.16rc1
timestamp: Fri 2009-06-12 18:39:44 +1000
message:
Add dev NEWS heading.
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
------------------------------------------------------------
revno: 4438.1.2
revision-id: jml at canonical.com-20090612083852-031puj7kgdklls2i
parent: jml at canonical.com-20090612083654-lkaws20kl5ah1825
committer: Jonathan Lange <jml at canonical.com>
branch nick: merge-back-1.16rc1
timestamp: Fri 2009-06-12 18:38:52 +1000
message:
Advance the version numbers.
modified:
bzrlib/__init__.py __init__.py-20050309040759-33e65acf91bbcd5d
------------------------------------------------------------
revno: 4438.1.1
revision-id: jml at canonical.com-20090612083654-lkaws20kl5ah1825
parent: pqm at pqm.ubuntu.com-20090612034412-oi5ll5wrbarb2w7s
parent: pqm at pqm.ubuntu.com-20090612054923-1mnu2u4g0goat507
committer: Jonathan Lange <jml at canonical.com>
branch nick: merge-back-1.16rc1
timestamp: Fri 2009-06-12 18:36:54 +1000
message:
Merge 1.16 back in.
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/__init__.py __init__.py-20050309040759-33e65acf91bbcd5d
------------------------------------------------------------
revno: 4431.3.3
revision-id: pqm at pqm.ubuntu.com-20090612054923-1mnu2u4g0goat507
parent: pqm at pqm.ubuntu.com-20090612045227-sbe3m34z9w6nzha5
parent: jml at canonical.com-20090612041621-kog755o8fjw31utb
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: 1.16
timestamp: Fri 2009-06-12 06:49:23 +0100
message:
(jml) Prepare 1.16rc1.
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
------------------------------------------------------------
revno: 4431.1.5
revision-id: jml at canonical.com-20090612041621-kog755o8fjw31utb
parent: jml at canonical.com-20090612035127-nulwgeg0nps7luur
committer: Jonathan Lange <jml at canonical.com>
branch nick: prepare-1.16
timestamp: Fri 2009-06-12 14:16:21 +1000
message:
Release 1.16rc1.
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
------------------------------------------------------------
revno: 4431.3.2
revision-id: pqm at pqm.ubuntu.com-20090612045227-sbe3m34z9w6nzha5
parent: pqm at pqm.ubuntu.com-20090611140558-eymvbxirvhuuh0m5
parent: jml at canonical.com-20090612035127-nulwgeg0nps7luur
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: 1.16
timestamp: Fri 2009-06-12 05:52:27 +0100
message:
(jml) Merge in overnight changes to trunk. This is the code of the
1.16rc1.
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/bzrdir.py bzrdir.py-20060131065624-156dfea39c4387cb
bzrlib/help_topics/__init__.py help_topics.py-20060920210027-rnim90q9e0bwxvy4-1
bzrlib/repofmt/groupcompress_repo.py repofmt.py-20080715094215-wp1qfvoo7093c8qr-1
bzrlib/repository.py rev_storage.py-20051111201905-119e9401e46257e3
bzrlib/smart/bzrdir.py bzrdir.py-20061122024551-ol0l0o0oofsu9b3t-1
bzrlib/smart/request.py request.py-20061108095550-gunadhxmzkdjfeek-1
bzrlib/tests/blackbox/test_init.py test_init.py-20060309032856-a292116204d86eb7
bzrlib/tests/test_remote.py test_remote.py-20060720103555-yeeg2x51vn0rbtdp-2
bzrlib/tests/test_smart.py test_smart.py-20061122024551-ol0l0o0oofsu9b3t-2
------------------------------------------------------------
revno: 4431.1.4
revision-id: jml at canonical.com-20090612035127-nulwgeg0nps7luur
parent: jml at canonical.com-20090611124359-8aswfoy3szqfosig
parent: pqm at pqm.ubuntu.com-20090612034412-oi5ll5wrbarb2w7s
committer: Jonathan Lange <jml at canonical.com>
branch nick: prepare-1.16
timestamp: Fri 2009-06-12 13:51:27 +1000
message:
Merge in overnight changes to trunk.
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/bzrdir.py bzrdir.py-20060131065624-156dfea39c4387cb
bzrlib/help_topics/__init__.py help_topics.py-20060920210027-rnim90q9e0bwxvy4-1
bzrlib/repofmt/groupcompress_repo.py repofmt.py-20080715094215-wp1qfvoo7093c8qr-1
bzrlib/repository.py rev_storage.py-20051111201905-119e9401e46257e3
bzrlib/smart/bzrdir.py bzrdir.py-20061122024551-ol0l0o0oofsu9b3t-1
bzrlib/smart/request.py request.py-20061108095550-gunadhxmzkdjfeek-1
bzrlib/tests/blackbox/test_init.py test_init.py-20060309032856-a292116204d86eb7
bzrlib/tests/test_remote.py test_remote.py-20060720103555-yeeg2x51vn0rbtdp-2
bzrlib/tests/test_smart.py test_smart.py-20061122024551-ol0l0o0oofsu9b3t-2
------------------------------------------------------------
revno: 4431.3.1
revision-id: pqm at pqm.ubuntu.com-20090611140558-eymvbxirvhuuh0m5
parent: pqm at pqm.ubuntu.com-20090611052211-b6b2pu471mdja7zz
parent: jml at canonical.com-20090611124359-8aswfoy3szqfosig
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: 1.16
timestamp: Thu 2009-06-11 15:05:58 +0100
message:
(jml) Merge in changes from trunk that belong in 1.16rc1.
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/__init__.py __init__.py-20050309040759-33e65acf91bbcd5d
bzrlib/bzrdir.py bzrdir.py-20060131065624-156dfea39c4387cb
bzrlib/remote.py remote.py-20060720103555-yeeg2x51vn0rbtdp-1
bzrlib/smart/bzrdir.py bzrdir.py-20061122024551-ol0l0o0oofsu9b3t-1
bzrlib/tests/blackbox/test_pull.py test_pull.py-20051201144907-64959364f629947f
bzrlib/tests/blackbox/test_push.py test_push.py-20060329002750-929af230d5d22663
bzrlib/tests/branch_implementations/test_stacking.py test_stacking.py-20080214020755-msjlkb7urobwly0f-1
bzrlib/tests/bzrdir_implementations/test_bzrdir.py test_bzrdir.py-20060131065642-0ebeca5e30e30866
bzrlib/tests/test_bzrdir.py test_bzrdir.py-20060131065654-deba40eef51cf220
bzrlib/tests/test_smart.py test_smart.py-20061122024551-ol0l0o0oofsu9b3t-2
------------------------------------------------------------
revno: 4431.1.3
tags: bzr-1.16rc1
revision-id: jml at canonical.com-20090611124359-8aswfoy3szqfosig
parent: jml at canonical.com-20090611121848-bkl2ophna53uhp2m
committer: Jonathan Lange <jml at canonical.com>
branch nick: prepare-1.16
timestamp: Thu 2009-06-11 22:43:59 +1000
message:
Release 1.16rc1.
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
------------------------------------------------------------
revno: 4431.1.2
revision-id: jml at canonical.com-20090611121848-bkl2ophna53uhp2m
parent: jml at canonical.com-20090611121214-vo0izdkl30869y97
committer: Jonathan Lange <jml at canonical.com>
branch nick: prepare-1.16
timestamp: Thu 2009-06-11 22:18:48 +1000
message:
Update version information for 1.16rc1
modified:
bzrlib/__init__.py __init__.py-20050309040759-33e65acf91bbcd5d
=== modified file 'NEWS'
--- a/NEWS 2009-06-12 03:44:12 +0000
+++ b/NEWS 2009-06-12 08:39:44 +0000
@@ -9,6 +9,21 @@
In Development
##############
+
+bzr 1.16rc1 "It's yesterday in California" 2009-06-11
+#####################################################
+:Codename: yesterday-in-california
+
+This version of Bazaar contains the beta release of the new ``2a`` repository
+format, suitable for testing by fearless, advanced users. This format or an
+updated version of it will become the default format in Bazaar 2.0. Please
+read the NEWS entry before even thinking about upgrading to the new format.
+
+Also included are speedups for many operations on huge projects, a bug fix for
+pushing stacked new stacked branches to smart servers and the usual bevy of
+bug fixes and improvements.
+
+
Compatibility Breaks
********************
=== modified file 'bzr'
--- a/bzr 2009-06-10 03:56:49 +0000
+++ b/bzr 2009-06-12 08:44:38 +0000
@@ -22,7 +22,7 @@
import sys
# update this on each release
-_script_version = (1, 16, 0)
+_script_version = (1, 17, 0)
if __doc__ is None:
print "bzr does not support python -OO."
=== modified file 'bzrlib/__init__.py'
--- a/bzrlib/__init__.py 2009-06-10 03:56:49 +0000
+++ b/bzrlib/__init__.py 2009-06-12 08:38:52 +0000
@@ -50,7 +50,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, 16, 0, 'dev', 0)
+version_info = (1, 17, 0, 'dev', 0)
# API compatibility version: bzrlib is currently API compatible with 1.15.
api_minimum_version = (1, 15, 0)
More information about the bazaar-commits
mailing list