Skip to content

Sparse follow-ups from #210: file-exact sidecar refusal on partial clones, widen during a stopped rebase #224

Closed

Description

@tonibergholm-codento

Found while reviewing PR #220 (fix for #210).

  1. Partial-clone sidecar refusal is likely too strict under a file-exact spec. materialize_conflict_state refuses a stop when a .theirs sidecar does not match the sparse spec (ADR-0049 refusal sc+http near-term posture: loopback-default + read-only server mode #2). A sidecar is always <conflicted path>.theirs beside a conflicted path that already passed the in-view gate, so under a spec like src/a.bin a valid in-view binary conflict is refused on a partial clone. Full clones no longer have this check (fix(repo): refuse out-of-sparse sealing inputs and sidecars at a conflict stop #220). Decide whether to treat a sidecar as in view when its base path is, and add a partial-clone test.
  2. Allow sc sparse set to widen while a rebase is stopped. It returns RebaseInProgress, so the refusal from sc rebase --continue for an out-of-view conflict or sealing input can only be fixed by aborting and rerunning the rebase (fix(repo): refuse out-of-sparse sealing inputs and sidecars at a conflict stop #220 changes the hint to say so). Widening mid-rebase would avoid losing the resolved commits.

Metadata

Metadata

Assignees

No one assigned

    Labels

    enhancementNew feature or request

    Type

    No type

    Projects

    No projects

      Milestone

      No milestone

      Relationships

      None yet

      Development

      No branches or pull requests

      Issue actions