# Keep a waiting strategy change's revision when a newer edit carries it · dara/icarus

[View on GitCafe](https://git.cafe/dara/icarus/commit/505e2a7b5bc0c151e96cdf6a4a1cafdb54d8c25b)

Repository: [dara/icarus](https://git.cafe/dara/icarus)

Visibility: public

Requested revision: 505e2a7b5bc0c151e96cdf6a4a1cafdb54d8c25b

Requested commit: 505e2a7b5bc0c151e96cdf6a4a1cafdb54d8c25b

Commit: 505e2a7b5bc0c151e96cdf6a4a1cafdb54d8c25b

Tree: f0eaf4be56ba1e0730ff41a44d9ceb3f756279b8

Author: Dara Adedeji

Committer: Dara Adedeji

## Message

```
Keep a waiting strategy change's revision when a newer edit carries it

A strategy patch has no field merge; the whole-strategy revision is its
only protection. When a newer edit merged into a strategy patch still
waiting in the outbox, the merged patch took the newer edit's revision.
A Bind recovered after a restart (made against revision 1) then rode a
theme change out at a teammate's revision 2, and the server wrote it over
the teammate's Haven without a conflict. The merged patch now keeps the
waiting one's revision, so the server refuses it and the user is asked.

A cloud strategy that names no theme profile (a custom palette alone) is
also drawn with none, instead of the default profile id: the unchanged
canvas compared unequal to the header it was drawn from, and the first
save replaced the waiting patch. The default palette still shows.

The test server now checks strategy patches against its header's
revision and updates the header it shows.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>

```

## Parents

- [f949e7dcb318d2df92630beabc57b565e33690da](https://git.cafe/dara/icarus/commit/f949e7dcb318d2df92630beabc57b565e33690da?format=markdown)

[Source at this commit](https://git.cafe/dara/icarus/tree/505e2a7b5bc0c151e96cdf6a4a1cafdb54d8c25b?format=markdown)