Rev 3960: (mbp) Merge back 1.11final in file:///home/pqm/archives/thelove/bzr/%2Btrunk/
Canonical.com Patch Queue Manager
pqm at pqm.ubuntu.com
Mon Jan 26 18:12:52 GMT 2009
At file:///home/pqm/archives/thelove/bzr/%2Btrunk/
------------------------------------------------------------
revno: 3960
revision-id: pqm at pqm.ubuntu.com-20090126181248-yl5ctbxc3y6nu9m4
parent: pqm at pqm.ubuntu.com-20090126115928-bzzqlmw316iv8o3k
parent: mbp at sourcefrog.net-20090126170421-dypt01en9zx8y16o
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Mon 2009-01-26 18:12:48 +0000
message:
(mbp) Merge back 1.11final
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
------------------------------------------------------------
revno: 3956.3.1
revision-id: mbp at sourcefrog.net-20090126170421-dypt01en9zx8y16o
parent: pqm at pqm.ubuntu.com-20090123181416-tku4gdtorboy6d0y
parent: mbp at sourcefrog.net-20090119113338-81srt3d42gpqyhqb
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: integration
timestamp: Mon 2009-01-26 15:04:21 -0200
message:
Merge back 1.11final
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
------------------------------------------------------------
revno: 3932.2.7
revision-id: mbp at sourcefrog.net-20090119113338-81srt3d42gpqyhqb
parent: mbp at sourcefrog.net-20090115074041-a4im46in3f8cb1vd
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: prepare-1.11
timestamp: Mon 2009-01-19 22:33:38 +1100
message:
Prepare 1.11final
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/__init__.py __init__.py-20050309040759-33e65acf91bbcd5d
------------------------------------------------------------
revno: 3932.2.6
revision-id: mbp at sourcefrog.net-20090115074041-a4im46in3f8cb1vd
parent: mbp at sourcefrog.net-20090115073758-1wmwy7kvgh7hxnh4
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: prepare-1.11
timestamp: Thu 2009-01-15 18:40:41 +1100
message:
Update news
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
------------------------------------------------------------
revno: 3932.2.5
revision-id: mbp at sourcefrog.net-20090115073758-1wmwy7kvgh7hxnh4
parent: pqm at pqm.ubuntu.com-20090114230346-i9lm6l9v3gz8zzeu
parent: pqm at pqm.ubuntu.com-20090110235923-dibvaa8suy8gk1ef
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: prepare-1.11
timestamp: Thu 2009-01-15 18:37:58 +1100
message:
Fix failing test when CompiledChunksToLines is not available.
modified:
bzrlib/tests/test_osutils.py test_osutils.py-20051201224856-e48ee24c12182989
------------------------------------------------------------
revno: 3932.2.4
revision-id: pqm at pqm.ubuntu.com-20090114230346-i9lm6l9v3gz8zzeu
parent: pqm at pqm.ubuntu.com-20090109083113-p1thptdqdbf68wix
parent: john at arbash-meinel.com-20090114193109-sramygcktbcz589f
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: 1.11
timestamp: Wed 2009-01-14 23:03:46 +0000
message:
(jam) Update stacking code so stacked branches don't open multiple
connections.
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/branch.py branch.py-20050309040759-e4baf4e0d046576e
bzrlib/bzrdir.py bzrdir.py-20060131065624-156dfea39c4387cb
bzrlib/tests/branch_implementations/test_stacking.py test_stacking.py-20080214020755-msjlkb7urobwly0f-1
bzrlib/tests/commands/test_push.py test_push.py-20070525122003-gc1ob0ea0nueoqgj-1
bzrlib/tests/test_bzrdir.py test_bzrdir.py-20060131065654-deba40eef51cf220
------------------------------------------------------------
revno: 3928.3.5
revision-id: john at arbash-meinel.com-20090114193109-sramygcktbcz589f
parent: john at arbash-meinel.com-20090109031355-rg3grll5bbshstf2
parent: pqm at pqm.ubuntu.com-20090109083113-p1thptdqdbf68wix
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: stacking_tweaks
timestamp: Wed 2009-01-14 13:31:09 -0600
message:
Merge in bzr.1.11, resolve NEWS
added:
bzrlib/tests/blackbox/test_filesystem_cicp.py test_filesystem_cicp-20081028010456-vclkg401m81keaxc-1
bzrlib/tests/https_server.py https_server.py-20071121173708-aj8zczi0ziwbwz21-1
bzrlib/tests/ssl_certs/ ssl_certs-20071124141654-dc9za9nho2gmzbri-1
bzrlib/tests/ssl_certs/__init__.py __init__.py-20071124141703-j5hr254lm287lyut-8
bzrlib/tests/ssl_certs/ca.crt ca.crt-20071124141703-j5hr254lm287lyut-7
bzrlib/tests/ssl_certs/ca.key ca.key-20071124141703-j5hr254lm287lyut-6
bzrlib/tests/ssl_certs/create_ssls.py create_ssls.py-20071124141703-j5hr254lm287lyut-5
bzrlib/tests/ssl_certs/server.crt server.crt-20071124141703-j5hr254lm287lyut-4
bzrlib/tests/ssl_certs/server.csr server.csr-20071124141703-j5hr254lm287lyut-3
bzrlib/tests/ssl_certs/server_with_pass.key server_with_pass.key-20071124141703-j5hr254lm287lyut-2
bzrlib/tests/ssl_certs/server_without_pass.key server_without_pass.-20071124141703-j5hr254lm287lyut-1
doc/developers/case-insensitive-file-systems.txt caseinsensitivefiles-20081117224243-p84xpmqnsa1p8k91-1
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/__init__.py __init__.py-20050309040759-33e65acf91bbcd5d
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/dirstate.py dirstate.py-20060728012006-d6mvoihjb3je9peu-1
bzrlib/errors.py errors.py-20050309040759-20512168c4e14fbd
bzrlib/mutabletree.py mutabletree.py-20060906023413-4wlkalbdpsxi2r4y-2
bzrlib/osutils.py osutils.py-20050309040759-eeaff12fbf77ac86
bzrlib/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
bzrlib/tests/blackbox/__init__.py __init__.py-20051128053524-eba30d8255e08dc3
bzrlib/tests/branch_implementations/test_branch.py testbranch.py-20050711070244-121d632bc37d7253
bzrlib/tests/http_server.py httpserver.py-20061012142527-m1yxdj1xazsf8d7s-1
bzrlib/tests/test_http.py testhttp.py-20051018020158-b2eef6e867c514d9
bzrlib/tests/test_osutils.py test_osutils.py-20051201224856-e48ee24c12182989
bzrlib/tests/test_plugins.py plugins.py-20050622075746-32002b55e5e943e9
bzrlib/tests/test_transform.py test_transaction.py-20060105172520-b3ffb3946550e6c4
bzrlib/tests/tree_implementations/test_inv.py test_inv.py-20070312023226-0cdvk5uwhutis9vg-1
bzrlib/tests/workingtree_implementations/test_move.py test_move.py-20070225171927-mohn2vqj5fx7edc6-1
bzrlib/trace.py trace.py-20050309040759-c8ed824bdcd4748a
bzrlib/transport/http/_pycurl.py pycurlhttp.py-20060110060940-4e2a705911af77a6
bzrlib/transport/http/_urllib.py _urlgrabber.py-20060113083826-0bbf7d992fbf090c
bzrlib/transport/http/ca_bundle.py ca_bundle.py-20070226091335-84kb1xg1r2jjf858-1
bzrlib/tree.py tree.py-20050309040759-9d5f2496be663e77
doc/developers/authentication-ring.txt authring.txt-20070718200437-q5tdik0ne6lor86d-1
doc/developers/index.txt index.txt-20070508041241-qznziunkg0nffhiw-1
setup.py setup.py-20050314065409-02f8a0a6e3f9bc70
tools/win32/bzr.iss.cog bzr.iss.cog-20060622100836-b3yup582rt3y0nvm-5
=== modified file 'NEWS'
--- a/NEWS 2009-01-26 11:59:28 +0000
+++ b/NEWS 2009-01-26 18:12:48 +0000
@@ -19,10 +19,6 @@
merge, we would cause the deletion to conflict a second time.
(Vincent Ladeuil, John Arbash Meinel)
-
-NOT RELEASED YET
-----------------
-
COMPATIBILITY BREAKS:
* By default, ``bzr status`` after a merge now shows just the pending
@@ -78,6 +74,10 @@
* ``ProgressBarStack`` is deprecated; instead use
``ui_factory.nested_progress_bar`` to create new progress bars.
+ * The progress and UI classes have changed; the main APIs remain the
+ same but code that provides a new UI or progress bar class may
+ need to be updated. (Martin Pool)
+
TESTING:
INTERNALS:
@@ -102,8 +102,9 @@
formatters to retrict the output.
(Vincent Ladeuil)
-bzr 1.11rc1 "Eyes up!" 2009-01-09
----------------------------------
+
+bzr 1.11 "Eyes up!" 2009-01-19
+------------------------------
This first monthly release of Bazaar for 2009 improves Bazaar's operation
in Windows, Mac OS X, and other situations where file names are matched
@@ -118,6 +119,19 @@
This release also fixes a number of bugs, particularly a glitch that can
occur when there are concurrent writes to a pack repository.
+ BUG FIXES:
+
+ * Fix failing test when CompiledChunksToLines is not available.
+ (Vincent Ladeuil)
+
+ * Stacked branches don't repeatedly open their transport connection.
+ (John Arbash Meinel)
+
+
+
+bzr 1.11rc1 "Eyes up!" 2009-01-09
+---------------------------------
+
CHANGES:
* Formats using Knit-based repository formats are now explicitly
@@ -331,10 +345,6 @@
advantage of pycurl is that it checks ssl certificates.)
(John Arbash Meinel)
- * The progress and UI classes have changed; the main APIs remain the
- same but code that provides a new UI or progress bar class may
- need to be updated. (Martin Pool)
-
* ``VersionedFiles.get_record_stream()`` can now return objects with a
storage_kind of ``chunked``. This is a collection (list/tuple) of
strings. You can use ``osutils.chunks_to_lines()`` to turn them into
More information about the bazaar-commits
mailing list