From: Daira Hopwood Date: Sun, 25 Oct 2015 13:13:36 +0000 (+0000) Subject: Writing a file without a db entry is an overwrite. X-Git-Url: https://git.rkrishnan.org/junkers?a=commitdiff_plain;h=210f4788cc1533b7a98231eca773877d2065a352;p=tahoe-lafs%2Ftahoe-lafs.git Writing a file without a db entry is an overwrite. Signed-off-by: Daira Hopwood --- diff --git a/docs/proposed/magic-folder/remote-to-local-sync.rst b/docs/proposed/magic-folder/remote-to-local-sync.rst index acc233c4..916a420e 100644 --- a/docs/proposed/magic-folder/remote-to-local-sync.rst +++ b/docs/proposed/magic-folder/remote-to-local-sync.rst @@ -350,6 +350,9 @@ remote change has been initially classified as an overwrite. .. _`Fire Dragons`: #fire-dragons-distinguishing-conflicts-from-overwrites +Note that writing a file that does not already have an entry in +the `magic folder db`_ is initially classed as an overwrite. + A *write/download collision* occurs when another program writes to ``foo`` in the local filesystem, concurrently with the new version being written by the Magic Folder client. We need to @@ -665,8 +668,9 @@ must not bother the user. For example, suppose that Alice's Magic Folder client sees a change to ``foo`` in Bob's DMD. If the version it downloads from Bob's DMD is "based on" the version currently in Alice's local filesystem at -the time Alice's client attempts to write the downloaded file, then -it is an overwrite. Otherwise it is initially classified as a +the time Alice's client attempts to write the downloaded file ‒or if +there is no existing version in Alice's local filesystem at that time‒ +then it is an overwrite. Otherwise it is initially classified as a conflict. This initial classification is used by the procedure for writing a