Skip to main content

Module sync

Module sync 

Source
Expand description

jouet stack sync: bring each layer up to date by merging its parent, bottom first, verifying each merge by ancestry and content before it is committed. Never a rebase, and never a force push.

The lessons this encodes:

  • A layer starts from its local branch, never origin/…, so fixes not yet pushed are kept; a local branch behind its remote is refused.
  • After a prerequisite merged (often squashed), the trunk is merged in rather than rebased onto, which would conflict with the old commits.
  • A merge whose tree lacks some of the parent’s changes is not committed: sync stops there and says what to do.
  • A branch checked out in another worktree belongs to whoever works there, so sync stops rather than change it under them.

Structs§

Options
Push
A push of one layer.
Report
Step
What happened to one layer, or would in a dry run.
Stopped
Where sync stopped, and what to do.

Functions§

sync
Syncs the stack, bottom first, stopping at the first layer that cannot be brought up to date.