Rev 2846: Relax Knit1 to Knit3 conversion restrictions to allow Knit1 to Pack3. in http://people.ubuntu.com/~robertc/baz2.0/repository

[Robert Collins]

At http://people.ubuntu.com/~robertc/baz2.0/repository

------------------------------------------------------------
revno: 2846
revision-id: robertc at robertcollins.net-20071019015730-w2j1rri19qqyhq6y
parent: robertc at robertcollins.net-20071019005716-owvnvr01kgswmeaq
committer: Robert Collins <robertc at robertcollins.net>
branch nick: repository
timestamp: Fri 2007-10-19 11:57:30 +1000
message:
  Relax Knit1 to Knit3 conversion restrictions to allow Knit1 to Pack3.
modified:
  bzrlib/repository.py           rev_storage.py-20051111201905-119e9401e46257e3
=== modified file 'bzrlib/repository.py'
--- a/bzrlib/repository.py	2007-10-18 01:32:19 +0000
+++ b/bzrlib/repository.py	2007-10-19 01:57:30 +0000
@@ -2447,11 +2447,11 @@
                 RepositoryFormatKnit3)
             from bzrlib.repofmt.pack_repo import (RepositoryFormatGraphKnit1,
                 RepositoryFormatGraphKnit3)
-            return (isinstance(source._format, RepositoryFormatKnit1) and
-                    isinstance(target._format, RepositoryFormatKnit3) or
-                    isinstance(source._format, (RepositoryFormatGraphKnit1)) and
-                    isinstance(target._format, (RepositoryFormatGraphKnit3))
-                    )
+            return (isinstance(source._format,
+                    (RepositoryFormatKnit1, RepositoryFormatGraphKnit1)) and
+                isinstance(target._format,
+                    (RepositoryFormatKnit3, RepositoryFormatGraphKnit3))
+                )
         except AttributeError:
             return False