Rev 5966: Merge 2.3 into trunk in http://bazaar.launchpad.net/~vila/bzr/integration/

[Vincent Ladeuil]

At http://bazaar.launchpad.net/~vila/bzr/integration/

------------------------------------------------------------
revno: 5966 [merge]
revision-id: v.ladeuil+lp at free.fr-20110609151354-9jhamg1n9mtfyo4x
parent: pqm at pqm.ubuntu.com-20110609132411-xxr3scf3mb9o585c
parent: pqm at pqm.ubuntu.com-20110609145625-av5fshuaujij0qe8
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: trunk
timestamp: Thu 2011-06-09 17:13:54 +0200
message:
  Merge 2.3 into trunk
modified:
  bzrlib/export/tar_exporter.py  tar_exporter.py-20051114235828-1f6349a2f090a5d0
  doc/en/release-notes/bzr-2.3.txt NEWS-20050323055033-4e00b5db738777ff
-------------- next part --------------
=== modified file 'bzrlib/export/tar_exporter.py'
--- a/bzrlib/export/tar_exporter.py	2011-06-07 13:33:41 +0000
+++ b/bzrlib/export/tar_exporter.py	2011-06-09 15:13:54 +0000
@@ -172,6 +172,7 @@
         stream.close()
 
 
+
 def tgz_exporter(tree, dest, root, subdir, filtered=False, force_mtime=None,
                  fileobj=None):
 

=== modified file 'doc/en/release-notes/bzr-2.3.txt'
--- a/doc/en/release-notes/bzr-2.3.txt	2011-05-20 17:27:26 +0000
+++ b/doc/en/release-notes/bzr-2.3.txt	2011-06-09 15:13:54 +0000
@@ -61,6 +61,10 @@
    suite.  This can include new facilities for writing tests, fixes to 
    spurious test failures and changes to the way things should be tested.
 
+* Remove the deprecation decorators for ``failUnlessExists`` and
+  ``failIfExists``. The deprecation "will" occur in 2.4, not
+  before. Providing the wrappers is enough as far as 2.3 is concerned.
+  (Vincent Ladeuil #794960)
 
 bzr 2.3.3
 #########