Rev 4191: (tanner) merge 1.13.1 to bzr.dev in file:///home/pqm/archives/thelove/bzr/%2Btrunk/
Canonical.com Patch Queue Manager
pqm at pqm.ubuntu.com
Tue Mar 24 03:41:21 GMT 2009
At file:///home/pqm/archives/thelove/bzr/%2Btrunk/
------------------------------------------------------------
revno: 4191
revision-id: pqm at pqm.ubuntu.com-20090324034116-embqt47gflj9vv54
parent: pqm at pqm.ubuntu.com-20090324015928-a4eisbr51odi0due
parent: tanner at real-time.com-20090324025617-u060935x12fm7vrr
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2009-03-24 03:41:16 +0000
message:
(tanner) merge 1.13.1 to bzr.dev
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/__init__.py __init__.py-20050309040759-33e65acf91bbcd5d
doc/developers/releasing.txt releasing.txt-20080502015919-fnrcav8fwy8ccibu-1
------------------------------------------------------------
revno: 4187.1.3
revision-id: tanner at real-time.com-20090324025617-u060935x12fm7vrr
parent: tanner at real-time.com-20090324023815-bz75b9jdcq5pihe1
committer: Robert J. Tanner <tanner at real-time.com>
branch nick: bzr.dev
timestamp: Mon 2009-03-23 21:56:17 -0500
message:
Fixed missed merged marker in the NEWS file
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
------------------------------------------------------------
revno: 4187.1.2
revision-id: tanner at real-time.com-20090324023815-bz75b9jdcq5pihe1
parent: tanner at real-time.com-20090324021424-hpfiw92rzujuvdjy
parent: pqm at pqm.ubuntu.com-20090321052800-lkcd8g0d4omhbdz5
committer: Robert J. Tanner <tanner at real-time.com>
branch nick: bzr.dev
timestamp: Mon 2009-03-23 21:38:15 -0500
message:
[merge] with bzr.dev
Conflict resolution of merge between 1.13.1 and 1.14dev
Reformatted 1.13.1 NEWS to match 1.14dev
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/__init__.py __init__.py-20050309040759-33e65acf91bbcd5d
doc/developers/releasing.txt releasing.txt-20080502015919-fnrcav8fwy8ccibu-1
------------------------------------------------------------
revno: 4104.1.8
revision-id: pqm at pqm.ubuntu.com-20090321052800-lkcd8g0d4omhbdz5
parent: pqm at pqm.ubuntu.com-20090320175018-i0qzf05ykb3aq5ix
parent: tanner at real-time.com-20090321043838-bozlzhbf06h9233i
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: 1.13
timestamp: Sat 2009-03-21 05:28:00 +0000
message:
(tanner) prepare 1.13.1
------------------------------------------------------------
revno: 4104.7.6
revision-id: tanner at real-time.com-20090321043838-bozlzhbf06h9233i
parent: tanner at real-time.com-20090318213815-k2il5ypm2ar3e40j
parent: pqm at pqm.ubuntu.com-20090320175018-i0qzf05ykb3aq5ix
committer: Robert J. Tanner <tanner at real-time.com>
branch nick: 1.13
timestamp: Fri 2009-03-20 23:38:38 -0500
message:
(tanner) prepare 1.13.1
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/tests/blackbox/test_merge.py test_merge.py-20060323225809-9bc0459c19917f41
------------------------------------------------------------
revno: 4104.1.7
revision-id: pqm at pqm.ubuntu.com-20090320175018-i0qzf05ykb3aq5ix
parent: pqm at pqm.ubuntu.com-20090319062034-studmrl3a8zd41j4
parent: john at arbash-meinel.com-20090320170630-8liglk35g1wmao4d
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: 1.13
timestamp: Fri 2009-03-20 17:50:18 +0000
message:
(robertc) Cherrypick the fix for 'bzr merge --force'
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/tests/blackbox/test_merge.py test_merge.py-20060323225809-9bc0459c19917f41
------------------------------------------------------------
revno: 4104.8.1
revision-id: john at arbash-meinel.com-20090320170630-8liglk35g1wmao4d
parent: pqm at pqm.ubuntu.com-20090319062034-studmrl3a8zd41j4
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: 1.13.1-merge-force
timestamp: Fri 2009-03-20 12:06:30 -0500
message:
Cherrypick the fix for merge --force onto 1.13.1
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/tests/blackbox/test_merge.py test_merge.py-20060323225809-9bc0459c19917f41
------------------------------------------------------------
revno: 4104.1.6
revision-id: pqm at pqm.ubuntu.com-20090319062034-studmrl3a8zd41j4
parent: pqm at pqm.ubuntu.com-20090318025424-1w4n71uqdq8786z9
parent: tanner at real-time.com-20090318213815-k2il5ypm2ar3e40j
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: 1.13
timestamp: Thu 2009-03-19 06:20:34 +0000
message:
(tanner) prepare for 1.13.1
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzr bzr.py-20050313053754-5485f144c7006fa6
bzrlib/__init__.py __init__.py-20050309040759-33e65acf91bbcd5d
doc/developers/releasing.txt releasing.txt-20080502015919-fnrcav8fwy8ccibu-1
------------------------------------------------------------
revno: 4104.7.5
revision-id: tanner at real-time.com-20090318213815-k2il5ypm2ar3e40j
parent: tanner at real-time.com-20090318205350-ln54dumk05hr8kde
committer: Robert J. Tanner <tanner at real-time.com>
branch nick: 1.13
timestamp: Wed 2009-03-18 16:38:15 -0500
message:
Release 1.13.1
Change ./bzr's _script_version to match ./bzrlib/__init__.py
version_info. (Bob Tanner, Martin Pool #345232)
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzr bzr.py-20050313053754-5485f144c7006fa6
------------------------------------------------------------
revno: 4104.7.4
revision-id: tanner at real-time.com-20090318205350-ln54dumk05hr8kde
parent: tanner at real-time.com-20090316070225-wlan7zaaddasrmse
parent: pqm at pqm.ubuntu.com-20090318025424-1w4n71uqdq8786z9
committer: Robert J. Tanner <tanner at real-time.com>
branch nick: 1.13
timestamp: Wed 2009-03-18 15:53:50 -0500
message:
Release 1.13.1.
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/__init__.py __init__.py-20050309040759-33e65acf91bbcd5d
------------------------------------------------------------
revno: 4104.7.3
revision-id: tanner at real-time.com-20090316070225-wlan7zaaddasrmse
parent: tanner at real-time.com-20090316034402-89rzdi5mfmfhgwiy
committer: Robert J. Tanner <tanner at real-time.com>
branch nick: prepare-1.13
timestamp: Mon 2009-03-16 02:02:25 -0500
message:
Link to HACKING's Overview of PQM
modified:
doc/developers/releasing.txt releasing.txt-20080502015919-fnrcav8fwy8ccibu-1
------------------------------------------------------------
revno: 4104.7.2
revision-id: tanner at real-time.com-20090316034402-89rzdi5mfmfhgwiy
parent: tanner at real-time.com-20090315043952-ws0ob6ka53wnsnhl
committer: Robert J. Tanner <tanner at real-time.com>
branch nick: prepare-1.13
timestamp: Sun 2009-03-15 22:44:02 -0500
message:
[Bug #343928] Changed NEWS file to reflect the proper format for generating GNU ChangeLogs.
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
------------------------------------------------------------
revno: 4104.7.1
revision-id: tanner at real-time.com-20090315043952-ws0ob6ka53wnsnhl
parent: pqm at pqm.ubuntu.com-20090315060207-fshwkgik718fiym4
committer: Robert J. Tanner <tanner at real-time.com>
branch nick: prepare-1.13
timestamp: Sat 2009-03-14 23:39:52 -0500
message:
Updated the releasing.html document, adding some documentation on things I had
to figure out myself.
modified:
doc/developers/releasing.txt releasing.txt-20080502015919-fnrcav8fwy8ccibu-1
------------------------------------------------------------
revno: 4104.1.5
revision-id: pqm at pqm.ubuntu.com-20090318025424-1w4n71uqdq8786z9
parent: pqm at pqm.ubuntu.com-20090315060207-fshwkgik718fiym4
parent: mbp at sourcefrog.net-20090318013933-e17726y51h4pcv5g
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: 1.13
timestamp: Wed 2009-03-18 02:54:24 +0000
message:
(mbp, basicosx) Corrections to 1.13 news
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
------------------------------------------------------------
revno: 4104.6.2
revision-id: mbp at sourcefrog.net-20090318013933-e17726y51h4pcv5g
parent: mbp at sourcefrog.net-20090318013538-66adyslf5gy0t5j3
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: prepare-1.13
timestamp: Wed 2009-03-18 12:39:33 +1100
message:
Correction to --log-format in changelog
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
------------------------------------------------------------
revno: 4104.6.1
revision-id: mbp at sourcefrog.net-20090318013538-66adyslf5gy0t5j3
parent: pqm at pqm.ubuntu.com-20090315060207-fshwkgik718fiym4
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: prepare-1.13
timestamp: Wed 2009-03-18 12:35:38 +1100
message:
Clearer headings for post-rc changes
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
------------------------------------------------------------
revno: 4187.1.1
revision-id: tanner at real-time.com-20090324021424-hpfiw92rzujuvdjy
parent: pqm at pqm.ubuntu.com-20090323202515-uwlqu9w037ndukz4
parent: pqm at pqm.ubuntu.com-20090324015928-a4eisbr51odi0due
committer: Robert J. Tanner <tanner at real-time.com>
branch nick: bzr.dev
timestamp: Mon 2009-03-23 21:14:24 -0500
message:
[merge] bzr.dev before merge of 1.13.1
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/bzrdir.py bzrdir.py-20060131065624-156dfea39c4387cb
bzrlib/diff.py diff.py-20050309040759-26944fbbf2ebbf36
bzrlib/errors.py errors.py-20050309040759-20512168c4e14fbd
bzrlib/filters/__init__.py __init__.py-20080416080515-mkxl29amuwrf6uir-2
bzrlib/graph.py graph_walker.py-20070525030359-y852guab65d4wtn0-1
bzrlib/hooks.py hooks.py-20070325015548-ix4np2q0kd8452au-1
bzrlib/index.py index.py-20070712131115-lolkarso50vjr64s-1
bzrlib/plugin.py plugin.py-20050622060424-829b654519533d69
bzrlib/remote.py remote.py-20060720103555-yeeg2x51vn0rbtdp-1
bzrlib/repofmt/knitrepo.py knitrepo.py-20070206081537-pyy4a00xdas0j4pf-1
bzrlib/repofmt/pack_repo.py pack_repo.py-20070813041115-gjv5ma7ktfqwsjgn-1
bzrlib/repofmt/weaverepo.py presplitout.py-20070125045333-wfav3tsh73oxu3zk-1
bzrlib/repository.py rev_storage.py-20051111201905-119e9401e46257e3
bzrlib/symbol_versioning.py symbol_versioning.py-20060105104851-9ecf8af605d15a80
bzrlib/tests/interrepository_implementations/test_interrepository.py test_interrepository.py-20060220061411-1ec13fa99e5e3eee
bzrlib/tests/per_repository/test_repository.py test_repository.py-20060131092128-ad07f494f5c9d26c
bzrlib/tests/test_hooks.py test_hooks.py-20070628030849-89rtsbe5dmer5npz-1
bzrlib/tests/test_merge.py testmerge.py-20050905070950-c1b5aa49ff911024
bzrlib/tests/test_plugins.py plugins.py-20050622075746-32002b55e5e943e9
bzrlib/tests/test_remote.py test_remote.py-20060720103555-yeeg2x51vn0rbtdp-2
bzrlib/tests/test_revision.py testrevision.py-20050804210559-46f5e1eb67b01289
bzrlib/tests/test_selftest.py test_selftest.py-20051202044319-c110a115d8c0456a
bzrlib/tests/test_symbol_versioning.py test_symbol_versioning.py-20060105104851-51d7722c2018d42b
bzrlib/tests/test_versionedfile.py test_versionedfile.py-20060222045249-db45c9ed14a1c2e5
bzrlib/trace.py trace.py-20050309040759-c8ed824bdcd4748a
bzrlib/transport/__init__.py transport.py-20050711165921-4978aa7ce1285ad5
bzrlib/transport/readonly.py readonly.py-20060120032407-66d3166c39ffdc79
bzrlib/transport/remote.py ssh.py-20060608202016-c25gvf1ob7ypbus6-1
bzrlib/tree.py tree.py-20050309040759-9d5f2496be663e77
bzrlib/version_info_formats/__init__.py generate_version_info.py-20051228204928-8358edabcddcd97e
bzrlib/weave.py knit.py-20050627021749-759c29984154256b
=== modified file 'NEWS'
--- a/NEWS 2009-03-24 01:08:12 +0000
+++ b/NEWS 2009-03-24 02:56:17 +0000
@@ -209,18 +209,37 @@
regardless of ``InterRepository``.
(Andrew Bennetts, Robert Collins)
-
bzr 1.13
########
:Codename: paraskavedekatriaphobia
:1.13: 2009-03-14
:1.13rc1: 2009-03-10
-
-This release includes bug fixes and a few performance and feature improvements.
-GNU Changelog output can now be produced by ``bzr log --gnu-changelog``.
-Debug flags can now be set in ``~/.bazaar/bazaar.conf``. Lightweight checkouts
-and stacked branches should both be much faster over remote connections.
+:1.13.1: 2009-03-23
+
+GNU Changelog output can now be produced by ``bzr log --gnu-changelog``. Debug
+flags can now be set in ``~/.bazaar/bazaar.conf``. Lightweight checkouts and
+stacked branches should both be much faster over remote connections.
+
+Changes From 1.13 to 1.13.1
+***************************
+A couple regessions where found in the 1.13 release. The pyrex-generated C
+extensions are missing from the .tar.gz and .zip files. Documentation on how
+to generate GNU ChangeLogs is wrong.
+
+Bug Fixes
+*********
+
+* Change ``./bzr``'s ``_script_version`` to match ./bzrlib/__init__.py
+ version_info. (Bob Tanner, Martin Pool, #345232)
+
+* Distribution archives for 1.13 do not contain generated C extension modules
+ (Jean-Francois Roy, Bob Tanner, #344465)
+
+* GNU ChangeLog output can now be produced by bzr log --format gnu-changelog is
+ incorrect (Deejay, Bob Tanner, Martin Pool, Robert Collins, #343928)
+
+* ``merge --force`` works again. (Robert Collins, #342105)
Changes From RC1 to Final
*************************
@@ -385,8 +404,7 @@
* Under rare circumstances (aka nobody reported a bug about it), the ftp
transport could revert to ascii mode. It now stays in binary mode except
- when needed.
- (Vincent Ladeuil)
+ when needed. (Vincent Ladeuil)
* Unshelve does not generate warnings about progress bars.
(Aaron Bentley, #328148)
=== modified file 'bzrlib/__init__.py'
--- a/bzrlib/__init__.py 2009-03-18 01:27:58 +0000
+++ b/bzrlib/__init__.py 2009-03-24 02:38:15 +0000
@@ -52,7 +52,6 @@
version_info = (1, 14, 0, 'dev', 0)
-
# API compatibility version: bzrlib is currently API compatible with 1.13.
api_minimum_version = (1, 13, 0)
=== modified file 'doc/developers/releasing.txt'
--- a/doc/developers/releasing.txt 2009-03-19 07:00:51 +0000
+++ b/doc/developers/releasing.txt 2009-03-24 02:38:15 +0000
@@ -127,7 +127,7 @@
available to the world.
#. In <https://launchpad.net/bzr/> click the "Release series" for this
- series, to take you to e.g. <https://launchpad.net/bzr/1.1>. Then
+ series, to take you to e.g. <https://launchpad.net/bzr/1.14>. Then
click "Register a release", and add information about this release.
#. Within that release, upload the source tarball and zipfile and the GPG
More information about the bazaar-commits
mailing list