The fourth verification round of the matches work found 18 defects in
the merge, Integrate and Matches surfaces. This commit fixes them:
- An Integrate job now carries the planning account's id, so its re-plan
decides ownership the way the dialog did.
- A merge skips only a project the kept sequence holds a real copy of
(name, offset head and history content) and re-points its renders to
that copy.
- A merge runs its trash checks before the Links stage and records an
undo, so an abandoned merge gives the other sequence back its link,
session keys and pairs.
- The metered hold adopts automatic transfers that were paused before a
restart.
- Apply in the Compare dialog re-plans when the plan is pending or stale.
- The Library's Two versions... lists the second versions a Union merge
leaves, each with Drop... (dry run, confirmation, verified partner).
A merge job's Open shows that list.
- The merge's typed confirmation is the invariant count, and the prompt
names it in all 38 languages.
- Italian text uses Principale and Gemello. The Main project is named
through WorkspaceText in the Projects part and in the twin tooltip.
- The session keys tooltip is split into two keys, and To trash... and
Delete on server... say why they are disabled.
- The capture restores the editor account before the Matches scenes.
- Upload again follows SyncHost.CanSendSync (Upload with Edit).
- Matches rows trim archive names in the middle on a rebalanced grid;
the Projects part rows trim, with the full text in the tooltip.
- The sample project targets use ProjectTransplant.FreeName.
DECISIONS, CHANGELOG, STATUS 8.7, the request doc and the 16 changed
capture baselines are updated.
Refs #73
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Integrate trashes a server photo only for the sequence's owner or an admin, a
Details stage stops instead of overwriting a server change the user had kept
this PC's value against, a merge retried after a stop plans again when work
reached the other sequence, detection keeps pairs answered while it ran, and a
sync row whose match the server deleted offers Keep here, Upload again and To
trash. The Integrate and merge logs say in the UI language why a version was
kept.
The edit-picker-twins capture scene showed no Twin chip, since a capture has no
workspace: it now lists sample workspace projects of the sample matches. The
screenshot baselines gain the 38 Matches screens and take the Matches chip,
the three Settings > Server rows, the longer priority list and 1.2.0.
Refs #73
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Upload again now deletes the gone pair row once the new sequence is linked, so
the pair stops reading "deleted on server" or "kept here". A linked upload the
server refuses into its sequence (403 for an account without Edit that does not
own it) falls back to ordinary uploads instead of failing; an Integrate that
would add photos to such a sequence is blocked in its plan (NoAddRight).
Automatic photo transfers pause on a metered connection whatever the option
says. Integrate trashes server photos only against the manifest version that
checked the winner, and a merge is blocked while the other sequence holds a
damaged photo nothing else holds (DamagedPhotos), so nothing unverified reaches
the trash.
The plan and the confirmations now say what really happens: replaced versions
are no longer counted as kept, a merge lists the kept sequence's replaced
photos, plan lines use the text colour, an integrated pair that left photos out
says new photos move by hand, and a merging pair reads "merging" with its
progress. The Compare dialog gets per-side tooltips, class sizes for both
sides, policy-aware class tooltips, column headings and readable file names;
the sync table shows "deleted there" with Review and warns on skipped rows; the
Edit picker names the server, the Library card shows the match status second,
a deleted server sequence is named instead of "0 photos", and the match
tooltips stop calling a sequence a copy. The capture scenes use the server
name, the link names and consistent sample sizes.
Refs #73
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
A merge could still trash photos it never verified, resume against a
pair the user had answered meanwhile, and take different unhashed
photos for copies; the dialog and the lists worded several facts
wrongly or lost them on refresh.
- Merge: a retry resumes only while the pair is still the job's;
Verify requires the other archive online and its folder in place,
stops on an unreadable photo, files a differing unhashed photo as a
second version and must cover every frame before Trash; the plan
hashes unmatched unhashed photos first, lists "Deleted in the other"
and names the relinked servers; second versions stay discoverable
(CopySides.VersionsAsync).
- Integrate: a retry after a failure before the journal runs again.
- Sync: a sequence back after a 404 stays Linked while its link holds;
a local cull no longer asks for attention.
- Block lines of both planners name the right sequence, archive,
server and space through one formatter.
- Compare dialog: one Details row per setting with worded values,
Projects headings, Choose focuses the kept-sequence radios, the
photo selection reaches rows outside the viewport, the Replace
confirmation lists the losers per side, plan lines read as queued.
- Matches and Library: counts first and grouped, integrating shown as
a share, local matches name the other archive, the Library keeps its
match and "deleted on server" statuses across a refresh.
Refs #73
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Server > Matches shows the pairs the copy engine found (same sequence on the
server and this PC, or twice here), attention first, with the design 8.1
actions; Keep apart and Unlink toast with Undo. The in-window Compare dialog
walks photos, details, projects and the plan, blocks until details are
chosen, and confirms only what replaces or merges (typed count for a merge).
Sync rows of an unanswered pair read "match found" and offer Compare first;
Upload all local skips suspected copies and says why. Settings > Server gains
Link matches, Integrate photos and Integrate projects. Library cards carry the
match status with Compare..., the sequence picker marks twins, and Jobs opens
Integrate and Merge targets. The sample engine and capture scenes render every
state; tests cover the text rules and the screens.
Refs #73
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>