Rev 3325: Merge 1.3final back to trunk in file:///home/pqm/archives/thelove/bzr/%2Btrunk/
Canonical.com Patch Queue Manager
pqm at pqm.ubuntu.com
Wed Apr 2 04:36:00 BST 2008
At file:///home/pqm/archives/thelove/bzr/%2Btrunk/
------------------------------------------------------------
revno: 3325
revision-id:pqm at pqm.ubuntu.com-20080402033550-znvaid7pkrjmf3gg
parent: pqm at pqm.ubuntu.com-20080401091848-6y4f104r061ad8bk
parent: mbp at sourcefrog.net-20080402014635-sgcp5cyfwsdjkgp1
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2008-04-02 04:35:50 +0100
message:
Merge 1.3final back to trunk
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/tests/blackbox/test_version.py test_version.py-20070312060045-ol7th9z035r3im3d-1
------------------------------------------------------------
revno: 3324.1.1
revision-id:mbp at sourcefrog.net-20080402014635-sgcp5cyfwsdjkgp1
parent: pqm at pqm.ubuntu.com-20080401091848-6y4f104r061ad8bk
parent: pqm at pqm.ubuntu.com-20080320092314-y4i0bpy37v8i1mc5
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: integration
timestamp: Wed 2008-04-02 11:46:35 +1000
message:
Merge 1.3final back to trunk
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/tests/blackbox/test_version.py test_version.py-20070312060045-ol7th9z035r3im3d-1
------------------------------------------------------------
revno: 3287.6.3
revision-id:pqm at pqm.ubuntu.com-20080320092314-y4i0bpy37v8i1mc5
parent: pqm at pqm.ubuntu.com-20080320031237-4j0t9j3rx1ep9dy5
parent: mbp at sourcefrog.net-20080320062925-fdyqyy9si0ekke9t
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: 1.3
timestamp: Thu 2008-03-20 09:23:14 +0000
message:
(mbp) prepare 1.3 final release
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzr bzr.py-20050313053754-5485f144c7006fa6
bzrlib/__init__.py __init__.py-20050309040759-33e65acf91bbcd5d
bzrlib/tests/blackbox/test_version.py test_version.py-20070312060045-ol7th9z035r3im3d-1
------------------------------------------------------------
revno: 3287.6.2.1.4
revision-id:mbp at sourcefrog.net-20080320062925-fdyqyy9si0ekke9t
parent: mbp at sourcefrog.net-20080320061715-xml8xtaqzftev1na
parent: mbp at sourcefrog.net-20080320062900-wyiqwmlx5gbvxx63
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: prepare-1.3
timestamp: Thu 2008-03-20 17:29:25 +1100
message:
(merge) Better test for --version contents
modified:
bzrlib/tests/blackbox/test_version.py test_version.py-20070312060045-ol7th9z035r3im3d-1
------------------------------------------------------------
revno: 3287.6.2.3.2
revision-id:mbp at sourcefrog.net-20080320062900-wyiqwmlx5gbvxx63
parent: mbp at sourcefrog.net-20080320061546-mqj8yb3o0bt0enkg
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: 202778-version-tests
timestamp: Thu 2008-03-20 17:29:00 +1100
message:
Better test for --version contents
modified:
bzrlib/tests/blackbox/test_version.py test_version.py-20070312060045-ol7th9z035r3im3d-1
------------------------------------------------------------
revno: 3287.6.2.1.3
revision-id:mbp at sourcefrog.net-20080320061715-xml8xtaqzftev1na
parent: mbp at sourcefrog.net-20080320054139-505822t5r9dw6bow
parent: mbp at sourcefrog.net-20080320061546-mqj8yb3o0bt0enkg
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: prepare-1.3
timestamp: Thu 2008-03-20 17:17:15 +1100
message:
merge fix for #202778
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/tests/blackbox/test_version.py test_version.py-20070312060045-ol7th9z035r3im3d-1
------------------------------------------------------------
revno: 3287.6.2.3.1
revision-id:mbp at sourcefrog.net-20080320061546-mqj8yb3o0bt0enkg
parent: pqm at pqm.ubuntu.com-20080320031237-4j0t9j3rx1ep9dy5
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: 202778-version-tests
timestamp: Thu 2008-03-20 17:15:46 +1100
message:
Don't require that the version number occur only once in --version
modified:
bzrlib/tests/blackbox/test_version.py test_version.py-20070312060045-ol7th9z035r3im3d-1
------------------------------------------------------------
revno: 3287.6.2.1.2
revision-id:mbp at sourcefrog.net-20080320054139-505822t5r9dw6bow
parent: mbp at sourcefrog.net-20080320053951-4bfq95eolpoxxqfh
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: prepare-1.3
timestamp: Thu 2008-03-20 16:41:39 +1100
message:
Prepare 1.3final
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzr bzr.py-20050313053754-5485f144c7006fa6
bzrlib/__init__.py __init__.py-20050309040759-33e65acf91bbcd5d
------------------------------------------------------------
revno: 3287.6.2.1.1
revision-id:mbp at sourcefrog.net-20080320053951-4bfq95eolpoxxqfh
parent: pqm at pqm.ubuntu.com-20080320031237-4j0t9j3rx1ep9dy5
parent: mbp at sourcefrog.net-20080320043554-tq7ql7tykubs6hq4
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: prepare-1.3
timestamp: Thu 2008-03-20 16:39:51 +1100
message:
Mention fix of #198793 in NEWS
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
------------------------------------------------------------
revno: 3287.6.2.2.1
revision-id:mbp at sourcefrog.net-20080320043554-tq7ql7tykubs6hq4
parent: pqm at pqm.ubuntu.com-20080320031237-4j0t9j3rx1ep9dy5
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: prepare-1.3
timestamp: Thu 2008-03-20 15:35:54 +1100
message:
Mention fix of #198793
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
------------------------------------------------------------
revno: 3287.6.2
revision-id:pqm at pqm.ubuntu.com-20080320031237-4j0t9j3rx1ep9dy5
parent: pqm at pqm.ubuntu.com-20080317072057-y9lmdvfugrk57kjh
parent: mbp at sourcefrog.net-20080320005258-2lufljo1xhzgk23p
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: 1.3
timestamp: Thu 2008-03-20 03:12:37 +0000
message:
(james_w) fix for bzr send with default client
modified:
bzrlib/mail_client.py mail_client.py-20070809192806-vuxt3t19srtpjpdn-1
bzrlib/tests/test_mail_client.py test_mail_client.py-20070809192806-vuxt3t19srtpjpdn-2
------------------------------------------------------------
revno: 3287.6.1.1.1
revision-id:mbp at sourcefrog.net-20080320005258-2lufljo1xhzgk23p
parent: pqm at pqm.ubuntu.com-20080317072057-y9lmdvfugrk57kjh
parent: jw+debian at jameswestby.net-20080319201306-wfrwtqs2n536gspa
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: prepare-1.3
timestamp: Thu 2008-03-20 11:52:58 +1100
message:
merge fix for bzr send with default client
modified:
bzrlib/mail_client.py mail_client.py-20070809192806-vuxt3t19srtpjpdn-1
bzrlib/tests/test_mail_client.py test_mail_client.py-20070809192806-vuxt3t19srtpjpdn-2
------------------------------------------------------------
revno: 3287.6.1
revision-id:pqm at pqm.ubuntu.com-20080317072057-y9lmdvfugrk57kjh
parent: pqm at pqm.ubuntu.com-20080316165803-tisoc9mpob9z544o
parent: mbp at sourcefrog.net-20080316230200-inw4wrjt6qlx76f2
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: 1.3
timestamp: Mon 2008-03-17 07:20:57 +0000
message:
post-1.3rc1 fixes
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
=== modified file 'NEWS'
--- a/NEWS 2008-04-01 04:19:06 +0000
+++ b/NEWS 2008-04-02 01:46:35 +0000
@@ -134,8 +134,8 @@
``Graph.get_parent_map`` returns a dict of key:parents. (Robert Collins)
-bzr 1.3rc1 2008-03-16
----------------------
+bzr 1.3 2008-03-20
+------------------
Bazaar has become part of the GNU project <http://www.gnu.org>
@@ -143,6 +143,16 @@
substantially faster. Several bugs have been fixed and several new options and
features have been added.
+ TESTING:
+
+ * Avoid spurious failure of ``TestVersion.test_version`` matching
+ directory names.
+ (#202778, Martin Pool)
+
+
+bzr 1.3rc1 2008-03-16
+---------------------
+
NOTES WHEN UPGRADING:
* The backup directory created by ``upgrade`` is now called
@@ -233,6 +243,9 @@
invoking external mail client in `bzr send` command.
(#139318, Alexander Belchenko)
+ * Fixed problem connecting to ``bzr+https://`` servers.
+ (#198793, John Ferlito)
+
* Improved error reporting in the Launchpad plugin. (Daniel Watkins,
#196618)
=== modified file 'bzrlib/tests/blackbox/test_version.py'
--- a/bzrlib/tests/blackbox/test_version.py 2008-02-07 08:47:27 +0000
+++ b/bzrlib/tests/blackbox/test_version.py 2008-03-20 06:29:00 +0000
@@ -1,4 +1,4 @@
-# Copyright (C) 2007 Canonical Ltd
+# Copyright (C) 2007, 2008 Canonical Ltd
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -34,7 +34,10 @@
def test_version(self):
out = self.run_bzr("version")[0]
self.assertTrue(len(out) > 0)
- self.assertEquals(1, out.count(bzrlib.__version__))
+ # must occur once; could be more if it matches a file path
+ first = out.splitlines()[0]
+ self.assertEqualDiff(first,
+ "Bazaar (bzr) %s" % bzrlib.__version__)
self.assertContainsRe(out, r"(?m)^ Python interpreter:")
self.assertContainsRe(out, r"(?m)^ Python standard library:")
self.assertContainsRe(out, r"(?m)^ bzrlib:")
More information about the bazaar-commits
mailing list