mirror of
https://github.com/penpot/penpot.git
synced 2026-10-29 14:00:37 +00:00
dcedd40a42
* 🐛 Refuse saves to a branch kept after its merge A branch kept after its merge stays an ordinary file with status "merged", so every save passed the edition check and appended ops to an op log that no command integrates any more. Refuse such saves with a :branch-merged validation error instead of stranding them. An archived branch still takes saves: restoring it brings them back. AI-assisted-by: claude-opus-5-5 Signed-off-by: Álvaro Tejero Cantero <alvorithm@teje.ro> * ✨ Tell merged and archived branches apart The workspace treated "merged" and "archived" as one state: an archived branch read "Merged branch" and lost every action, and a merged row offered Restore, which the backend always refused. Each status now has its own presentation. A kept merged branch keeps "Merged branch" and View in main, and opens read-only: the workspace permissions drop :can-edit while it is the open file, the way a viewer gets a read-only workspace. An archived branch says so in the banner and offers Compare and Restore. The header notes each status, the switcher lists merged and archived branches in two collapsible groups, the all-branches dialog gets a Merged tab, and the branch info dialog offers Restore and Compare for an archived branch. AI-assisted-by: claude-opus-5-5 Signed-off-by: Álvaro Tejero Cantero <alvorithm@teje.ro> * ✨ Refuse saves to an archived branch An archived branch is now read-only, like a merged one: the user restores it, or turns it into an ordinary file, to keep editing. persist-branch-file! refuses its saves with a :branch-archived validation error, distinct from :branch-merged so the client can say which way out applies. A restored branch takes saves again, and so does an archived branch turned into an ordinary file. AI-assisted-by: claude-opus-5-5 Signed-off-by: Álvaro Tejero Cantero <alvorithm@teje.ro> * ✨ Open archived branches read-only with their ways out An archived branch now opens read-only, like a merged one. Its banner, its branch info dialog and its row in the all-branches dialog offer the two ways back to editing, Restore and Turn into an ordinary file, next to Compare. The header and switcher note reads "Archived, read only". A save the server refuses because the branch is merged or archived now shows a warning that names the way out, instead of the generic autosave error with a report link. AI-assisted-by: claude-opus-5-5 Signed-off-by: Álvaro Tejero Cantero <alvorithm@teje.ro> --------- Signed-off-by: Álvaro Tejero Cantero <alvorithm@teje.ro>