Rev 4163: (tanner) [merge] Release manager 1.13 additions to releasing.txt in file:///home/pqm/archives/thelove/bzr/%2Btrunk/

Canonical.com Patch Queue Manager pqm at pqm.ubuntu.com
Wed Mar 18 05:18:13 GMT 2009


At file:///home/pqm/archives/thelove/bzr/%2Btrunk/

------------------------------------------------------------
revno: 4163
revision-id: pqm at pqm.ubuntu.com-20090318051809-7p0igxlyeg4szx72
parent: pqm at pqm.ubuntu.com-20090318043730-vt9fcxb6ndb8toxa
parent: tanner at real-time.com-20090318041348-qx3tx9nlu5785f14
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2009-03-18 05:18:09 +0000
message:
  (tanner) [merge] Release manager 1.13 additions to releasing.txt
modified:
  NEWS                           NEWS-20050323055033-4e00b5db738777ff
  doc/developers/releasing.txt   releasing.txt-20080502015919-fnrcav8fwy8ccibu-1
    ------------------------------------------------------------
    revno: 4152.2.6
    revision-id: tanner at real-time.com-20090318041348-qx3tx9nlu5785f14
    parent: tanner at real-time.com-20090318024400-e8kcmvi7t3x4r832
    parent: pqm at pqm.ubuntu.com-20090318034536-m78yf86gruh3qvh3
    committer: Robert J. Tanner <tanner at real-time.com>
    branch nick: 1.14
    timestamp: Tue 2009-03-17 23:13:48 -0500
    message:
      merge with bzr.dev
    modified:
      NEWS                           NEWS-20050323055033-4e00b5db738777ff
      bzrlib/_dirstate_helpers_c.pyx dirstate_helpers.pyx-20070503201057-u425eni465q4idwn-3
      bzrlib/dirstate.py             dirstate.py-20060728012006-d6mvoihjb3je9peu-1
      bzrlib/tests/test__dirstate_helpers.py test_dirstate_helper-20070504035751-jsbn00xodv0y1eve-2
      bzrlib/tests/test_dirstate.py  test_dirstate.py-20060728012006-d6mvoihjb3je9peu-2
    ------------------------------------------------------------
    revno: 4152.2.5
    revision-id: tanner at real-time.com-20090318024400-e8kcmvi7t3x4r832
    parent: tanner at real-time.com-20090318005332-72fjyjruijbbx8mu
    parent: pqm at pqm.ubuntu.com-20090318021431-md1n8o3542wwsvai
    committer: Robert J. Tanner <tanner at real-time.com>
    branch nick: 1.14
    timestamp: Tue 2009-03-17 21:44:00 -0500
    message:
      Tweak request by mbp for releasing.txt
      Merge with bzr.dev
    modified:
      NEWS                           NEWS-20050323055033-4e00b5db738777ff
      bzrlib/bundle/serializer/v4.py v10.py-20070611062757-5ggj7k18s9dej0fr-1
      bzrlib/lockable_files.py       control_files.py-20051111201905-bb88546e799d669f
      bzrlib/remote.py               remote.py-20060720103555-yeeg2x51vn0rbtdp-1
      bzrlib/tests/interrepository_implementations/test_fetch.py test_fetch.py-20080425213627-j60cjh782ufm83ry-1
      bzrlib/tests/test_remote.py    test_remote.py-20060720103555-yeeg2x51vn0rbtdp-2
      doc/developers/releasing.txt   releasing.txt-20080502015919-fnrcav8fwy8ccibu-1
    ------------------------------------------------------------
    revno: 4152.2.4
    revision-id: tanner at real-time.com-20090318005332-72fjyjruijbbx8mu
    parent: tanner at real-time.com-20090317220419-w6wze3suu9kw3k3i
    parent: pqm at pqm.ubuntu.com-20090317230937-pwr84cnqjoyzybex
    committer: Robert J. Tanner <tanner at real-time.com>
    branch nick: 1.14
    timestamp: Tue 2009-03-17 19:53:32 -0500
    message:
      [merge] with bzr.dev
    modified:
      NEWS                           NEWS-20050323055033-4e00b5db738777ff
      bzrlib/commands.py             bzr.py-20050309040720-d10f4714595cf8c3
      bzrlib/help.py                 help.py-20050505025907-4dd7a6d63912f894
      bzrlib/option.py               option.py-20051014052914-661fb36e76e7362f
      bzrlib/plugin.py               plugin.py-20050622060424-829b654519533d69
      bzrlib/tests/blackbox/test_help.py test_help.py-20060216004358-4ee8a2a338f75a62
      bzrlib/tests/test_help.py      test_help.py-20070419045354-6q6rq15j9e2n5fna-1
    ------------------------------------------------------------
    revno: 4152.2.3
    revision-id: tanner at real-time.com-20090317220419-w6wze3suu9kw3k3i
    parent: tanner at real-time.com-20090317054900-wxzf8x0kbkul4gmz
    parent: pqm at pqm.ubuntu.com-20090317120304-4brn8hqgc79ybdhx
    committer: Robert J. Tanner <tanner at real-time.com>
    branch nick: 1.14
    timestamp: Tue 2009-03-17 17:04:19 -0500
    message:
      Merge with bzr.dev
      Add my experiences with being the release manager for 1.13 to releasing doco
    modified:
      NEWS                           NEWS-20050323055033-4e00b5db738777ff
      bzrlib/builtins.py             builtins.py-20050830033751-fc01482b9ca23183
      bzrlib/graph.py                graph_walker.py-20070525030359-y852guab65d4wtn0-1
      bzrlib/knit.py                 knit.py-20051212171256-f056ac8f0fbe1bd9
      bzrlib/remote.py               remote.py-20060720103555-yeeg2x51vn0rbtdp-1
      bzrlib/repository.py           rev_storage.py-20051111201905-119e9401e46257e3
      bzrlib/smart/repository.py     repository.py-20061128022038-vr5wy5bubyb8xttk-1
      bzrlib/tests/__init__.py       selftest.py-20050531073622-8d0e3c8845c97a64
      bzrlib/tests/blackbox/test_branch.py test_branch.py-20060524161337-noms9gmcwqqrfi8y-1
      bzrlib/tests/branch_implementations/test_push.py test_push.py-20070130153159-fhfap8uoifevg30j-1
      bzrlib/tests/interrepository_implementations/test_interrepository.py test_interrepository.py-20060220061411-1ec13fa99e5e3eee
      bzrlib/tests/test_branch.py    test_branch.py-20060116013032-97819aa07b8ab3b5
      bzrlib/tests/test_commands.py  test_command.py-20051019190109-3b17be0f52eaa7a8
      bzrlib/tests/test_generate_docs.py test_generate_docs.p-20070102123151-cqctnsrlqwmiljd7-1
      bzrlib/tests/test_graph.py     test_graph_walker.py-20070525030405-enq4r60hhi9xrujc-1
      bzrlib/tests/test_http_response.py test_http_response.py-20060628233143-950b2a482a32505d
      bzrlib/tests/test_osutils.py   test_osutils.py-20051201224856-e48ee24c12182989
      bzrlib/tests/test_osutils_encodings.py test_osutils_encodin-20061226013130-kkp732tpt3lm91vv-1
      bzrlib/tests/test_pack.py      test_container.py-20070607160755-tr8zc26q18rn0jnb-2
      bzrlib/tests/test_progress.py  test_progress.py-20060308160359-978c397bc79b7fda
      bzrlib/tests/test_remote.py    test_remote.py-20060720103555-yeeg2x51vn0rbtdp-2
      bzrlib/tests/test_selftest.py  test_selftest.py-20051202044319-c110a115d8c0456a
      bzrlib/tests/test_smart_transport.py test_ssh_transport.py-20060608202016-c25gvf1ob7ypbus6-2
      bzrlib/tests/test_symbol_versioning.py test_symbol_versioning.py-20060105104851-51d7722c2018d42b
      bzrlib/tests/test_xml.py       test_xml.py-20050905091053-80b45588931a9b35
    ------------------------------------------------------------
    revno: 4152.2.2
    revision-id: tanner at real-time.com-20090317054900-wxzf8x0kbkul4gmz
    parent: tanner at real-time.com-20090317053042-npglrfwe8yeb4s99
    committer: Robert J. Tanner <tanner at real-time.com>
    branch nick: 1.14
    timestamp: Tue 2009-03-17 00:49:00 -0500
    message:
      Updated to releasing.txt based on my experiences as the release manager for
      1.13rc1 and 1.13final.
      
      Updated some of the release numbers in the examples to 2 digits (old example
      used 1.6 alot, updated to use 1.14), made mistake an missed the period between
      bzr and revision (bzr.1.4) on url for for the submit_branch in the
      locations.conf
      
      Added some more information regarding PQM and a link to the HACKING section
      regarding PQM.
    modified:
      doc/developers/releasing.txt   releasing.txt-20080502015919-fnrcav8fwy8ccibu-1
    ------------------------------------------------------------
    revno: 4152.2.1
    revision-id: tanner at real-time.com-20090317053042-npglrfwe8yeb4s99
    parent: pqm at pqm.ubuntu.com-20090317005047-1qd1zwlgpc5y8t1i
    committer: Robert J. Tanner <tanner at real-time.com>
    branch nick: 1.14
    timestamp: Tue 2009-03-17 00:30:42 -0500
    message:
      [#343928] Update NEWS to fix documentation on bzr log options for GNU
      changelogs
    modified:
      NEWS                           NEWS-20050323055033-4e00b5db738777ff
=== modified file 'NEWS'
--- a/NEWS	2009-03-18 04:37:30 +0000
+++ b/NEWS	2009-03-18 05:18:09 +0000
@@ -140,9 +140,9 @@
 ---------------------------------------------
 
 This release includes bug fixes and a few performance and feature improvements.
-GNU Changelog output can now be produced by ``bzr log --log-format 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.
+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 bzr 1.13rc1 2009-03-10:
 
@@ -174,8 +174,8 @@
       in chapter 7 of the User Guide and ``bzr help view`` for details.
       (Ian Clatworthy)
 
-    * GNU Changelog output can now be produced by ``bzr log --log-format
-      gnu-changelog``.  (Andrea Bolognani, Martin Pool)
+    * GNU Changelog output can now be produced by ``bzr log --gnu-changelog``.
+      (Andrea Bolognani, Martin Pool)
 
     * The ``-Dmemory`` flag now gives memory information on Windows.
       (John Arbash Meinel)

=== modified file 'doc/developers/releasing.txt'
--- a/doc/developers/releasing.txt	2009-03-17 00:50:47 +0000
+++ b/doc/developers/releasing.txt	2009-03-18 02:44:00 +0000
@@ -17,15 +17,23 @@
 #. Make a local branch for preparing this release.  (Only for the first 
    release in a series, otherwise you should already have a branch.) ::
 
-     bzr branch trunk prepare-1.6
+     bzr branch trunk prepare-1.14
+
+#. Download the pqm plugin and install it into your ``~/.bazaar/plugins``::
+
+     bzr branch lp:bzr-pqm ~/.bazaar/plugins/pqm
 
 #. Configure pqm-submit for this branch, with a section like this in
    ``~/.bazaar/locations.conf``::
 
-	[/home/mbp/bzr/prepare-1.4]
+	[/home/mbp/bzr/prepare-1.14]
 	pqm_email = Canonical PQM <pqm at bazaar-vcs.org>
-	submit_branch = http://bazaar-vcs.org/bzr/bzr.1.4
+	submit_branch = http://bazaar-vcs.org/bzr/bzr.1.14
+	public_branch = http://bazaar.your-domain.com/bzr
 	submit_to = bazaar at lists.canonical.com
+	smtp_server = mail.your-domain.com:25
+
+    Please see <http://doc.bazaar-vcs.org/latest/developers/HACKING.html#an-overview-of-pqm> for more details on PQM
 
 #. In the release branch, update  ``version_info`` in
    ``./bzrlib/__init__.py``.  Check the output of ``bzr --version``.
@@ -41,7 +49,7 @@
 
 #. Commit these changes to the release branch, using a command like::
     
-     bzr commit -m "Release 0.12rc1." 
+     bzr commit -m "Release 1.14." 
    
    The diff before you commit will be something like::
 
@@ -81,13 +89,15 @@
       
 #. Tag the new release::
 
-     bzr tag bzr-1.12rc1 
+     bzr tag bzr-1.14
 
-#. Submit those changes to PQM for merge into the appropriate release
-   branch::
+#. Push those changes to a bzr reposistory that is public and accessible on
+   the Internet. PQM will pull from this repository when it attempts to merge
+   your changes. Then submit those changes to PQM for merge into the
+   appropriate release branch::
  
      bzr push
-     bzr pqm-submit -m "(mbp) prepare 1.6"
+     bzr pqm-submit -m "(mbp) prepare 1.14"
 
 #. When PQM succeeds, pull down the master release branch.
 
@@ -175,8 +185,8 @@
    you do not have a Freshmeat account yet, ask one of the existing
    admins.
 
-#. Update http://en.wikipedia.org/wiki/Bzr -- this should be done for
-   final releases but not for Release Candidates.
+#. Update http://en.wikipedia.org/wiki/Bazaar_(software) -- this should be done
+for final releases but not for Release Candidates.
 
 #. Update the python package index: <http://pypi.python.org/pypi/bzr> - best
    done by running ::




More information about the bazaar-commits mailing list