Rev 3656: Fix last references to RepositoryFormatPackDevelopment0. in http://people.ubuntu.com/~robertc/baz2.0/integration
Robert Collins
robertc at robertcollins.net
Tue Sep 2 04:21:14 BST 2008
At http://people.ubuntu.com/~robertc/baz2.0/integration
------------------------------------------------------------
revno: 3656
revision-id: robertc at robertcollins.net-20080902032110-3aifmw3k02b4dfzw
parent: robertc at robertcollins.net-20080902031708-7dqsmwjiwfni9s2c
committer: Robert Collins <robertc at robertcollins.net>
branch nick: integration
timestamp: Tue 2008-09-02 13:21:10 +1000
message:
Fix last references to RepositoryFormatPackDevelopment0.
modified:
bzrlib/repository.py rev_storage.py-20051111201905-119e9401e46257e3
=== modified file 'bzrlib/repository.py'
--- a/bzrlib/repository.py 2008-08-29 19:32:00 +0000
+++ b/bzrlib/repository.py 2008-09-02 03:21:10 +0000
@@ -2317,19 +2317,7 @@
)
# Development formats.
-# 1.2->1.3
-# development 0 - stub to introduce development versioning scheme.
-format_registry.register_lazy(
- "Bazaar development format 0 (needs bzr.dev from before 1.3)\n",
- 'bzrlib.repofmt.pack_repo',
- 'RepositoryFormatPackDevelopment0',
- )
-format_registry.register_lazy(
- ("Bazaar development format 0 with subtree support "
- "(needs bzr.dev from before 1.3)\n"),
- 'bzrlib.repofmt.pack_repo',
- 'RepositoryFormatPackDevelopment0Subtree',
- )
+# 1.5->1.6
format_registry.register_lazy(
"Bazaar development format 1 (needs bzr.dev from before 1.6)\n",
'bzrlib.repofmt.pack_repo',
@@ -2341,7 +2329,7 @@
'bzrlib.repofmt.pack_repo',
'RepositoryFormatPackDevelopment1Subtree',
)
-# 1.3->1.4 go below here
+# 1.6->1.7 go below here
class InterRepository(InterObject):
@@ -2925,13 +2913,13 @@
RepositoryFormatKnitPack4,
RepositoryFormatKnitPack5,
RepositoryFormatKnitPack5RichRoot,
- RepositoryFormatPackDevelopment0,
- RepositoryFormatPackDevelopment0Subtree,
+ RepositoryFormatPackDevelopment1,
+ RepositoryFormatPackDevelopment1Subtree,
)
nosubtrees = (
RepositoryFormatKnit1,
RepositoryFormatKnitPack1,
- RepositoryFormatPackDevelopment0,
+ RepositoryFormatPackDevelopment1,
RepositoryFormatKnitPack4,
RepositoryFormatKnitPack5,
RepositoryFormatKnitPack5RichRoot,
@@ -2939,7 +2927,7 @@
subtrees = (
RepositoryFormatKnit3,
RepositoryFormatKnitPack3,
- RepositoryFormatPackDevelopment0Subtree,
+ RepositoryFormatPackDevelopment1Subtree,
)
return (isinstance(source._format, nosubtrees) and
isinstance(target._format, subtrees))
More information about the bazaar-commits
mailing list