Fix rebase conflicts

Author: lionel-

crates/oak_db/src/tests/file_resolve.rs

@@ -633,11 +633,11 @@ fn test_resolve_if_else_in_collated_file_offers_both() {
         &db,
         file_path("/w/pkg/DESCRIPTION"),
         "pkg".to_string(),
-        None,
-        oak_package_metadata::namespace::Namespace::default(),
+        FileRevision::zero(),
+        FileRevision::zero(),
+        Some(oak_package_metadata::namespace::Namespace::default()),
         Vec::new(),
         Vec::new(),
-        None,
     );
 
     let a = File::new(
@@ -685,11 +685,11 @@ fn test_resolve_collated_sequential_redef_resolves_to_last() {
         &db,
         file_path("/w/pkg/DESCRIPTION"),
         "pkg".to_string(),
-        None,
-        oak_package_metadata::namespace::Namespace::default(),
+        FileRevision::zero(),
+        FileRevision::zero(),
+        Some(oak_package_metadata::namespace::Namespace::default()),
         Vec::new(),
         Vec::new(),
-        None,
     );
 
     let a = File::new(

crates/oak_db/src/tests/package_resolve.rs

@@ -205,11 +205,11 @@ fn test_reexport_via_import_from_resolves_to_source() {
         &db,
         file_path("workspace/tibble/DESCRIPTION"),
         "tibble".to_string(),
-        None,
-        tibble_ns,
+        FileRevision::zero(),
+        FileRevision::zero(),
+        Some(tibble_ns),
         Vec::new(),
         Vec::new(),
-        None,
     );
     let tibble_file = File::new(
         &db,
@@ -232,11 +232,11 @@ fn test_reexport_via_import_from_resolves_to_source() {
         &db,
         file_path("workspace/dplyr/DESCRIPTION"),
         "dplyr".to_string(),
-        None,
-        dplyr_ns,
+        FileRevision::zero(),
+        FileRevision::zero(),
+        Some(dplyr_ns),
         Vec::new(),
         Vec::new(),
-        None,
     );
     let dplyr_file = File::new(
         &db,