Rev 4631: Merge bugfix for 413957. in http://bazaar.launchpad.net/~lifeless/bzr/bug-398668

[Robert Collins]

At http://bazaar.launchpad.net/~lifeless/bzr/bug-398668

------------------------------------------------------------
revno: 4631 [merge]
revision-id: robertc at robertcollins.net-20090817064520-2x82e5me8l40q810
parent: robertc at robertcollins.net-20090817064034-kittyy0ctmg6byss
parent: robertc at robertcollins.net-20090817064352-a97la78pifayqque
committer: Robert Collins <robertc at robertcollins.net>
branch nick: bug-398668
timestamp: Mon 2009-08-17 16:45:20 +1000
message:
  Merge bugfix for 413957.
modified:
  bzrlib/tests/test_repository.py test_repository.py-20060131075918-65c555b881612f4d
=== modified file 'bzrlib/tests/test_repository.py'
--- a/bzrlib/tests/test_repository.py	2009-08-17 06:40:34 +0000
+++ b/bzrlib/tests/test_repository.py	2009-08-17 06:45:20 +0000
@@ -1357,7 +1357,7 @@
     """Tests for the packs repository Packer class."""
 
     def test_pack_optimizes_pack_order(self):
-        builder = self.make_branch_builder('.')
+        builder = self.make_branch_builder('.', format="1.9")
         builder.start_series()
         builder.build_snapshot('A', None, [
             ('add', ('', 'root-id', 'directory', None)),