Rev 5527: (jam) Catch UnicodeError for optparse parsing (ryorke) in file:///home/pqm/archives/thelove/bzr/%2Btrunk/

[Canonical.com Patch Queue Manager]

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

------------------------------------------------------------
revno: 5527 [merge]
revision-id: pqm at pqm.ubuntu.com-20101105220352-6xhxk5kg1hz7fe31
parent: pqm at pqm.ubuntu.com-20101105173954-s66k204jmq4ts8l1
parent: john at arbash-meinel.com-20101105205432-rmyozu8sthyhmri8
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Fri 2010-11-05 22:03:52 +0000
message:
  (jam) Catch UnicodeError for optparse parsing (ryorke)
modified:
  bzrlib/bundle/serializer/__init__.py __init__.py-20051118175413-86b97db0b618feef
  bzrlib/cmd_test_script.py      cmd_test_script.py-20101020120519-7hst41avona524nn-1
  bzrlib/registry.py             lazy_factory.py-20060809213415-2gfvqadtvdn0phtg-1
  bzrlib/rules.py                properties.py-20080506032617-9k06uqalkf09ck0z-1
  bzrlib/tests/blackbox/test_version_info.py test_bb_version_info.py-20051228204928-91711c6559d952f7
  bzrlib/tests/per_workingtree/test_unversion.py test_unversion.py-20060907074408-bygh2y28jz8u0cg7-1
  bzrlib/tests/scenarios.py      variations.py-20101008080748-qpn38ldpyvzvkrhg-1
  bzrlib/tests/test_registry.py  test_lazy_factory.py-20060809213415-2gfvqadtvdn0phtg-2
  bzrlib/tests/test_scenarios.py test_variations.py-20101008084845-jy33m3zbh2ck1ka1-1
  bzrlib/tests/test_testament.py testtestament.py-20051011100429-5df1657310caa929
  doc/en/release-notes/bzr-2.3.txt NEWS-20050323055033-4e00b5db738777ff
=== modified file 'bzrlib/bundle/serializer/__init__.py'
--- a/bzrlib/bundle/serializer/__init__.py	2010-09-21 03:20:09 +0000
+++ b/bzrlib/bundle/serializer/__init__.py	2010-11-05 20:54:32 +0000
@@ -1,4 +1,4 @@
-# Copyright (C) 2005, 2006 Canonical Ltd
+# Copyright (C) 2005, 2006, 2007, 2009, 2010 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

=== modified file 'bzrlib/cmd_test_script.py'
--- a/bzrlib/cmd_test_script.py	2010-10-20 19:20:46 +0000
+++ b/bzrlib/cmd_test_script.py	2010-11-05 20:54:32 +0000
@@ -1,4 +1,4 @@
-# Copyright (C) 2009, 2010 Canonical Ltd
+# Copyright (C) 2010 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

=== modified file 'bzrlib/registry.py'
--- a/bzrlib/registry.py	2010-09-21 03:20:09 +0000
+++ b/bzrlib/registry.py	2010-11-05 20:54:32 +0000
@@ -1,4 +1,4 @@
-# Copyright (C) 2006, 2008 Canonical Ltd
+# Copyright (C) 2006-2010 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

=== modified file 'bzrlib/rules.py'
--- a/bzrlib/rules.py	2010-10-31 14:31:17 +0000
+++ b/bzrlib/rules.py	2010-11-05 20:54:32 +0000
@@ -1,4 +1,4 @@
-# Copyright (C) 2008 Canonical Ltd
+# Copyright (C) 2008, 2009, 2010 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

=== modified file 'bzrlib/tests/blackbox/test_version_info.py'
--- a/bzrlib/tests/blackbox/test_version_info.py	2010-09-29 12:13:52 +0000
+++ b/bzrlib/tests/blackbox/test_version_info.py	2010-11-05 20:54:32 +0000
@@ -1,4 +1,4 @@
-# Copyright (C) 2005, 2006 Canonical Ltd
+# Copyright (C) 2005-2010 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

=== modified file 'bzrlib/tests/per_workingtree/test_unversion.py'
--- a/bzrlib/tests/per_workingtree/test_unversion.py	2010-10-04 22:10:49 +0000
+++ b/bzrlib/tests/per_workingtree/test_unversion.py	2010-11-05 20:54:32 +0000
@@ -1,4 +1,4 @@
-# Copyright (C) 2006 Canonical Ltd
+# Copyright (C) 2006, 2007, 2009, 2010 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

=== modified file 'bzrlib/tests/scenarios.py'
--- a/bzrlib/tests/scenarios.py	2010-10-11 22:40:23 +0000
+++ b/bzrlib/tests/scenarios.py	2010-11-05 20:54:32 +0000
@@ -1,4 +1,4 @@
-# Copyright (C) 2005-2010 Canonical Ltd
+# Copyright (C) 2010 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

=== modified file 'bzrlib/tests/test_registry.py'
--- a/bzrlib/tests/test_registry.py	2010-09-21 03:20:09 +0000
+++ b/bzrlib/tests/test_registry.py	2010-11-05 20:54:32 +0000
@@ -1,4 +1,4 @@
-# Copyright (C) 2006 Canonical Ltd
+# Copyright (C) 2006, 2008, 2009, 2010 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

=== modified file 'bzrlib/tests/test_scenarios.py'
--- a/bzrlib/tests/test_scenarios.py	2010-10-11 22:40:23 +0000
+++ b/bzrlib/tests/test_scenarios.py	2010-11-05 20:54:32 +0000
@@ -1,4 +1,4 @@
-# Copyright (C) 2005-2010 Canonical Ltd
+# Copyright (C) 2010 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

=== modified file 'bzrlib/tests/test_testament.py'
--- a/bzrlib/tests/test_testament.py	2010-10-13 14:32:22 +0000
+++ b/bzrlib/tests/test_testament.py	2010-11-05 20:54:32 +0000
@@ -1,4 +1,4 @@
-# Copyright (C) 2005, 2006 Canonical Ltd
+# Copyright (C) 2005-2010 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

=== modified file 'doc/en/release-notes/bzr-2.3.txt'
--- a/doc/en/release-notes/bzr-2.3.txt	2010-11-05 15:57:40 +0000
+++ b/doc/en/release-notes/bzr-2.3.txt	2010-11-05 20:54:32 +0000
@@ -323,6 +323,10 @@
   involving the pycurl https test server fail otherwise when running
   selftest from an installed version. (Vincent Ladeuil, #651706)
 
+* Blank output section in scriptrunner tests no longer match any output.
+  Instead, use '...' as a wildcard if you don't care about the output.
+  (Martin Pool, #637830)
+
 * Fix tests that failed when run under ``LANG=C``.
   (Andrew Bennetts, #632387)