diff -r db065b33fa56 -r b422acba55f1 rust/hg-cpython/src/dirstate/dirstate_map.rs
--- a/rust/hg-cpython/src/dirstate/dirstate_map.rs	Mon Nov 04 11:00:58 2024 +0100
+++ b/rust/hg-cpython/src/dirstate/dirstate_map.rs	Mon Nov 04 11:07:05 2024 +0100
@@ -18,7 +18,7 @@
     dirstate::dirstate_map::{
         DirstateEntryReset, DirstateIdentity as CoreDirstateIdentity,
     },
-    dirstate::{ParentFileData, TruncatedTimestamp},
+    dirstate::entry::{DirstateEntry, ParentFileData, TruncatedTimestamp},
 };
 
 use crate::{
@@ -30,8 +30,8 @@
     dirstate::dirstate_map::DirstateMapWriteMode,
     dirstate::on_disk::DirstateV2ParseError,
     dirstate::owning::OwningDirstateMap, dirstate::StateMapIter, revlog::Node,
-    utils::files::normalize_case, utils::hg_path::HgPath, DirstateEntry,
-    DirstateError, DirstateParents,
+    utils::files::normalize_case, utils::hg_path::HgPath, DirstateError,
+    DirstateParents,
 };
 
 // TODO