Rev 5298: (vila) Merge 2.1 into bzr.dev including fix for bug #586926 in file:///home/pqm/archives/thelove/bzr/%2Btrunk/

[Canonical.com Patch Queue Manager]

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

------------------------------------------------------------
revno: 5298 [merge]
revision-id: pqm at pqm.ubuntu.com-20100616155835-w1l604cbw3du1jwr
parent: pqm at pqm.ubuntu.com-20100615101932-2r8oodhzh49yhhjh
parent: v.ladeuil+lp at free.fr-20100616124751-knove5iu86fxk089
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2010-06-16 16:58:35 +0100
message:
  (vila) Merge 2.1 into bzr.dev including fix for bug #586926
modified:
  NEWS                           NEWS-20050323055033-4e00b5db738777ff
  bzrlib/bundle/bundle_data.py   read_changeset.py-20050619171944-c0d95aa685537640
=== modified file 'NEWS'
--- a/NEWS	2010-06-15 07:44:29 +0000
+++ b/NEWS	2010-06-16 12:47:51 +0000
@@ -56,13 +56,16 @@
   test that all commands available to the test suite have help.
   (Robert Collins, #177500)
 
+* Raise ValueError instead of a string exception.
+  (John Arbash Meinel, #586926)
+
+* Relative imports in plugins are now handled correctly when using
+  BZR_PLUGINS_AT. (Vincent Ladeuil, #588959)
+
 * ``ScriptRunner`` now strips off leading indentation from test scripts,
   which previously caused "SyntaxError: No command for line".
   (Martin Pool)
 
-* Relative imports in plugins are now handled correctly when using
-  BZR_PLUGINS_AT. (Vincent Ladeuil, #588959)
-
 Improvements
 ************
 
@@ -806,6 +809,39 @@
   happens, and another warning will be written if the log file could not
   be closed after retrying 100 times.  (Andrew Bennetts, #531746)
 
+bzr 2.1.3
+#########
+
+:Codename: Do run run
+:2.1.3: NOT RELEASED YET
+
+Compatibility Breaks
+********************
+
+New Features
+************
+
+Bug Fixes
+*********
+
+* Raise ValueError instead of a string exception.
+  (John Arbash Meinel, #586926)
+
+Improvements
+************
+
+Documentation
+*************
+
+API Changes
+***********
+
+Internals
+*********
+
+Testing
+*******
+
 bzr 2.1.2
 #########
 
@@ -1301,6 +1337,9 @@
   permissions as ``.bzr`` directory on a POSIX OS.
   (Parth Malwankar, #262450)
 
+* Raise ValueError instead of a string exception.
+  (John Arbash Meinel, #586926)
+
 * Reduce peak memory by one copy of compressed text.
   (John Arbash Meinel, #566940)
 

=== modified file 'bzrlib/bundle/bundle_data.py'
--- a/bzrlib/bundle/bundle_data.py	2010-06-09 22:48:52 +0000
+++ b/bzrlib/bundle/bundle_data.py	2010-06-16 12:47:51 +0000
@@ -1,4 +1,4 @@
-# Copyright (C) 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