huskies: merge 1010

server/src/crdt_state/write/migrations.rs

@@ -333,7 +333,7 @@ mod stage_migration_tests {
     use super::super::item::write_item;
     use super::*;
     use crate::crdt_state::read_item;
-    use crate::pipeline_state::{BranchName, Stage};
+    use crate::pipeline_state::{BranchName, PlanState, Stage};
     use std::num::NonZeroU32;
 
     /// Seed a pipeline item with a raw, possibly-legacy stage register value,
@@ -370,7 +370,10 @@ mod stage_migration_tests {
             (
                 "9503_legacy_coding",
                 "2_current",
-                Stage::Coding { claim: None },
+                Stage::Coding {
+                    claim: None,
+                    plan: PlanState::Missing,
+                },
             ),
             (
                 "9504_legacy_blocked",
@@ -452,7 +455,10 @@ mod stage_migration_tests {
         // Seed two items: one already in clean form, one in legacy form.
         write_item(
             "9520_already_clean",
-            &Stage::Coding { claim: None },
+            &Stage::Coding {
+                claim: None,
+                plan: PlanState::Missing,
+            },
             Some("Already Clean"),
             None,
             None,