[Pkg-bazaar-commits] ./bzr/unstable r3831: New upstream.
Jelmer Vernooij
jelmer at samba.org
Sun Mar 29 14:42:16 UTC 2009
------------------------------------------------------------
revno: 3831
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: unstable
timestamp: Sun 2009-03-29 16:42:16 +0200
message:
New upstream.
modified:
NEWS
bzr
bzrlib/__init__.py
bzrlib/builtins.py
bzrlib/tests/blackbox/test_merge.py
debian/changelog
doc/developers/releasing.txt
------------------------------------------------------------
revno: 3815.360.1
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
------------------------------------------------------------
revno: 3815.360.2
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
------------------------------------------------------------
revno: 3815.222.114
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
------------------------------------------------------------
revno: 3815.222.115
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
bzr
bzrlib/__init__.py
doc/developers/releasing.txt
------------------------------------------------------------
revno: 3815.361.1
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
------------------------------------------------------------
revno: 3815.361.2
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
------------------------------------------------------------
revno: 3815.361.3
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
------------------------------------------------------------
revno: 3815.361.4
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
bzrlib/__init__.py
------------------------------------------------------------
revno: 3815.361.5
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
bzr
------------------------------------------------------------
revno: 3815.222.116
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
bzrlib/builtins.py
bzrlib/tests/blackbox/test_merge.py
------------------------------------------------------------
revno: 3815.362.1
author: Robert Collins <robertc at robertcollins.net>
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
bzrlib/builtins.py
bzrlib/tests/blackbox/test_merge.py
------------------------------------------------------------
revno: 3815.222.117
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: 3815.361.6
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
bzrlib/builtins.py
bzrlib/tests/blackbox/test_merge.py
-------------- next part --------------
=== modified file 'NEWS'
--- a/NEWS 2009-03-14 11:17:14 +0000
+++ b/NEWS 2009-03-20 17:06:30 +0000
@@ -4,18 +4,36 @@
.. contents::
+bzr 1.13.1 2009-03-19
+---------------------
+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)
+
bzr 1.13 "paraskavedekatriaphobia" 2009-03-14
---------------------------------------------
This release includes bug fixes and a few performance and feature improvements.
-GNU Changelog output can now be produced by ``bzr 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:
- BUG FIXES:
-
* Fix "is not a stackable format" error when pushing a
stackable-format branch with an unstackable-format repository to a
destination with a default stacking policy. (Andrew Bennetts)
@@ -44,8 +62,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 --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 'bzr'
--- a/bzr 2009-02-23 15:29:35 +0000
+++ b/bzr 2009-03-18 21:38:15 +0000
@@ -22,7 +22,7 @@
import sys
# update this on each release
-_script_version = (1, 13, 0)
+_script_version = (1, 13, 1)
if __doc__ is None:
print "bzr does not support python -OO."
=== modified file 'bzrlib/__init__.py'
--- a/bzrlib/__init__.py 2009-03-14 11:17:14 +0000
+++ b/bzrlib/__init__.py 2009-03-18 20:53:50 +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, 13, 0, 'final', 0)
+version_info = (1, 13, 1, 'final', 0)
# API compatibility version: bzrlib is currently API compatible with 1.13.
=== modified file 'bzrlib/builtins.py'
--- a/bzrlib/builtins.py 2009-03-10 02:44:32 +0000
+++ b/bzrlib/builtins.py 2009-03-20 17:06:30 +0000
@@ -3373,9 +3373,10 @@
basis_tree = tree.revision_tree(tree.last_revision())
except errors.NoSuchRevision:
basis_tree = tree.basis_tree()
- changes = tree.changes_from(basis_tree)
- if changes.has_changed():
- raise errors.UncommittedChanges(tree)
+ if not force:
+ changes = tree.changes_from(basis_tree)
+ if changes.has_changed():
+ raise errors.UncommittedChanges(tree)
view_info = _get_view_info_for_change_reporter(tree)
change_reporter = delta._ChangeReporter(
=== modified file 'bzrlib/tests/blackbox/test_merge.py'
--- a/bzrlib/tests/blackbox/test_merge.py 2009-02-27 08:37:19 +0000
+++ b/bzrlib/tests/blackbox/test_merge.py 2009-03-20 17:06:30 +0000
@@ -491,6 +491,18 @@
out, err = self.run_bzr(['merge', '-d', 'a', 'b'])
self.assertContainsRe(err, 'Warning: criss-cross merge encountered.')
+ def test_merge_force(self):
+ tree_a = self.make_branch_and_tree('a')
+ self.build_tree(['a/foo'])
+ tree_a.add(['foo'])
+ tree_a.commit('add file')
+ tree_b = tree_a.bzrdir.sprout('b').open_workingtree()
+ self.build_tree_contents([('a/foo', 'change 1')])
+ tree_a.commit('change file')
+ tree_b.merge_from_branch(tree_a.branch)
+ tree_a.commit('empty change to allow merge to run')
+ self.run_bzr(['merge', '../a', '--force'], working_dir='b')
+
def test_merge_from_submit(self):
tree_a = self.make_branch_and_tree('a')
tree_b = tree_a.bzrdir.sprout('b').open_workingtree()
=== modified file 'debian/changelog'
--- a/debian/changelog 2009-03-19 17:16:40 +0000
+++ b/debian/changelog 2009-03-29 14:42:16 +0000
@@ -1,4 +1,4 @@
-bzr (1.13-1) unstable; urgency=low
+bzr (1.13.1-1) unstable; urgency=low
* New upstream release.
* Move to section vcs.
=== modified file 'doc/developers/releasing.txt'
--- a/doc/developers/releasing.txt 2009-02-23 19:50:54 +0000
+++ b/doc/developers/releasing.txt 2009-03-16 07:02:25 +0000
@@ -17,15 +17,24 @@
#. 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 checkout --lighweight lp:bzr-pqm
+ mv bzr-pqm 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``.
@@ -36,7 +45,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::
@@ -76,13 +85,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 accessiable 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.
@@ -110,7 +121,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
@@ -170,8 +181,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 Pkg-bazaar-commits
mailing list