External/beardrive
1
0
Fork 0
mirror of https://github.com/runbear-io/beardrive.git synced 2026-08-25 08:08:08 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix(sync): connecting a folder adopts the project's files instead of forking them (#159)

Browse Source 
A device's first cycle on a volume was treated as a concurrent edit for every
path the project already held. Whichever side's clock happened to sort higher
won -- so a joiner's seeded .bdriveignore or agent-written AGENTS.md could
replace the team's -- and the loser landed beside it as a
.bdrive-conflict-<device>-<time> file.

A first cycle is a join, not an edit. Cycle step 1b holds the scan's ops back
over the pull and demotes any whose path the project already holds to lamport
0, which sorts under every op a project can carry (scan's clock starts at 1).
The project's version then wins deterministically on every device, and
conflictCopies skips those ops the way it already skips re-asserted ones. The
local content is still journaled and pushed, so it stays in History and
`bdrive restore --list <path>` can bring it back. Reported as `adopted: N`.

Concurrent edits after the join are untouched.


Claude-Session: https://claude.ai/code/session_01GLCyEWP2XZhYjBssvdCDQm

Co-authored-by: Claude Opus 5 (1M context) <noreply@anthropic.com>
This commit is contained in:
Snow Lee (Sungwon)
2026-08-12 16:10:10 -07:00
committed by GitHub
co-authored by Claude Opus 5
parent 7eabb3baf4
commit 33ca0caeab
8 changed files with 339 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
web/docs/src/content/docs/concepts/how-it-works.md
+9
View File
@@ -50,6 +50,15 @@ Concurrent edits keep the last writer at the path. The loser is preserved as a
`name.bdrive-conflict-<device>-<time>` file by the device that detects the
overlap. Nothing is silently dropped.
**Joining is an adoption, not a merge.** On a device's first sync of a project,
a local file at a path the project already holds is not a concurrent edit — it
is a folder that happened to contain the same path (a checkout of the same
docs, an agent-written `AGENTS.md`, the `.bdriveignore` `bdrive init` seeds).
The project's version wins on every device and no conflict copy is made. Your
copy is still journaled and pushed as a superseded version of that path, so
`bdrive restore --list <path>` can bring it back. `bdrive sync` reports these as
`adopted`.
## The daemon
A per-mount daemon scans the folder every few seconds and exchanges with the