Rev 3185: Replace is not with ./bzr selftest Development1 -1= for correctness. in http://people.ubuntu.com/~robertc/baz2.0/inventory.journalled

[Robert Collins]

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

------------------------------------------------------------
revno: 3185
revision-id:robertc at robertcollins.net-20080108042036-j5dgdue3u9vfvuas
parent: robertc at robertcollins.net-20080108040140-p81v3wsny42twxrh
committer: Robert Collins <robertc at robertcollins.net>
branch nick: inventory.journalled
timestamp: Tue 2008-01-08 15:20:36 +1100
message:
  Replace is not with ./bzr selftest Development1 -1= for correctness.
modified:
  bzrlib/journalled_inventory.py journalled_inventory-20080103020931-0ht5n40kwc0p7fy1-1
=== modified file 'bzrlib/journalled_inventory.py'
--- a/bzrlib/journalled_inventory.py	2008-01-08 04:01:40 +0000
+++ b/bzrlib/journalled_inventory.py	2008-01-08 04:20:36 +0000
@@ -210,9 +210,10 @@
                 if file_id != 'TREE_ROOT':
                     raise errors.BzrError(
                         'file_id %s is not TREE_ROOT for /' % file_id)
-                if last_modified is not NULL_REVISION:
+                if last_modified != NULL_REVISION:
                     raise errors.BzrError(
-                        'Version present for / in %s' % file_id)
+                        'Version present (%s) for / in %s' %
+                        (last_modified, file_id))
                 self.by_id[file_id] = (utf8_path, file_id, parent_id,
                     self.version, content)
             else:
@@ -436,8 +437,8 @@
             parent_id = parent_id or None
             by_id[file_id] = (newpath_utf8, file_id, parent_id,
                 last_modified, tuple(content.split('\x00')))
-            if newpath_utf8 == '/' and not self._versioned_root and (
-                last_modified != 'null:' or file_id != 'TREE_ROOT'):
+            if newpath_utf8 == '/' and not self._versioned_root:
+                if last_modified != 'null:' or file_id != 'TREE_ROOT':
                     raise errors.BzrError("Versioned root found: %r" % line)
             elif newpath_utf8 != 'None' and last_modified[-1] == ':':
                     raise errors.BzrError('special revisionid found: %r' % line)