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>
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>
Detection, Integrate and Merge need one comparison of two copies of a time-lapse, so
this adds it: CopyComparer classifies every photo (same, converted, same unhashed,
deleted here/there, differs, two versions, only here/there) with strict Differs and
Versions rules so whole-second capture times and bursts never pair, unusable frames
held as nothing and marked for repair, and the score of design 3.2.
CopyRules ports 1.1's same-originals gate exactly for "Link when half shared" and
holds the Decide table, ask-again thresholds, fingerprints, hints and the probe
sample. CopyPayload compares details in portable form (same photo at another index is
no line) and merges the chosen sides into one payload that must parse as a project.
CopySides reads both sides from the index and a server and answers the last-copy
check across every archive. SyncTombstones gains FromDtos for local pairs.
Refs #73
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>