Rev 4639: Fix formats for per_repository upgrade-to-stacking test. in http://bazaar.launchpad.net/~lifeless/bzr/bug-398668

[Robert Collins]

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

------------------------------------------------------------
revno: 4639
revision-id: robertc at robertcollins.net-20090817214820-f7zfexr4i9rj35eo
parent: robertc at robertcollins.net-20090817212424-2hnzif3gsmpg063f
committer: Robert Collins <robertc at robertcollins.net>
branch nick: bug-398668
timestamp: Tue 2009-08-18 07:48:20 +1000
message:
  Fix formats for per_repository upgrade-to-stacking test.
=== modified file 'bzrlib/tests/per_repository/test_repository.py'
--- a/bzrlib/tests/per_repository/test_repository.py	2009-06-26 09:24:34 +0000
+++ b/bzrlib/tests/per_repository/test_repository.py	2009-08-17 21:48:20 +0000
@@ -929,8 +929,14 @@
         transport.mkdir('.')
         target_bzrdir = bzrdir_format.initialize_on_transport(transport)
         branch = BzrBranchFormat6().initialize(target_bzrdir)
-        #branch = self.make_branch('repo/branch', format='pack-0.92')
-        self.make_branch('stack-on-me')
+        if not repo.supports_rich_root():
+            stack_on_format = "pack-0.92"
+        else:
+            if repo._format.supports_chks:
+                stack_on_format = "2a"
+            else:
+                stack_on_format = "1.9-rich-root"
+        self.make_branch('stack-on-me', format=stack_on_format)
         self.make_bzrdir('.').get_config().set_default_stack_on('stack-on-me')
         target = branch.bzrdir.clone(self.get_url('target'))
         # The target branch supports stacking if the source repository does.