From: Daira Hopwood Date: Fri, 29 May 2015 01:49:55 +0000 (+0100) Subject: Minor fixes. X-Git-Url: https://git.rkrishnan.org/specifications/install.html?a=commitdiff_plain;h=c7e81ce6f0f1182a69a65d375c0e76dd535845ae;p=tahoe-lafs%2Ftahoe-lafs.git Minor fixes. 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 3563dbc9..5a35f2dc 100644 --- a/docs/proposed/magic-folder/remote-to-local-sync.rst +++ b/docs/proposed/magic-folder/remote-to-local-sync.rst @@ -494,7 +494,7 @@ interleaving with four as on Unix). The cases are: rename of ``foo.other`` to ``foo`` both precede our rename in step 4b. We do not get an event for its rename by step 2. Its changes end up at ``foo.backup``, and ours end up at ``foo`` - after being linked there in step 4c. This avoids data loss. + after being moved there in step 4c′. This avoids data loss. * Interleaving C′: the other process' deletion of ``foo`` precedes our rename of ``foo`` to ``foo.backup`` done by `ReplaceFileW`_, @@ -508,11 +508,13 @@ interleaving with four as on Unix). The cases are: * Interleaving D′: the other process' deletion and/or rename happen during the call to `ReplaceFileW`_, causing the latter to fail. There are two subcases: + * if the error is ``ERROR_UNABLE_TO_MOVE_REPLACEMENT_2``, then ``foo`` is renamed to ``foo.backup`` and ``.foo.tmp`` remains at its original name after the call. * for all other errors, ``foo`` and ``.foo.tmp`` both remain at their original names after the call. + In both subcases, we reclassify as a conflict and rename ``.foo.tmp`` to ``foo.conflicted``. This avoids data loss.