ExternalVendorCode/tahoe-lafs
1
0
Fork 0
mirror of https://github.com/tahoe-lafs/tahoe-lafs.git synced 2024-12-25 15:41:06 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Clearer names (and fix a formatting issue).

Browse Source 
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
This commit is contained in:
Daira Hopwood 2015-11-04 15:29:01 +00:00
parent e2a3b5ff63
commit 06298408ff
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
docs/proposed/magic-folder/remote-to-local-sync.rst
View File

@ -775,7 +775,7 @@ Now we are ready to describe the algorithm for determining whether a
download for the file ``foo`` is an overwrite or a conflict (refining download for the file ``foo`` is an overwrite or a conflict (refining
step 2 of the procedure from the `Earth Dragons`_ section). step 2 of the procedure from the `Earth Dragons`_ section).
Let ``last_downloaded_uri`` be the field of that name obtained from Let ``dmd_last_downloaded_uri`` be the field of that name obtained from
the directory entry metadata for ``foo`` in Bob's DMD (this field the directory entry metadata for ``foo`` in Bob's DMD (this field
may be absent). Then the algorithm is: may be absent). Then the algorithm is:
@ -791,15 +791,15 @@ may be absent). Then the algorithm is:
table when the file was last uploaded); table when the file was last uploaded);
* the ``last_uploaded_uri`` field of the ``local_files`` table * the ``last_uploaded_uri`` field of the ``local_files`` table
for this file, which is the URI under which the file was last for this file, which is the URI under which the file was last
uploaded. uploaded. Call this ``db_entry.last_uploaded_uri``.
* 2c. If any of the following are true, then classify as a conflict: * 2c. If any of the following are true, then classify as a conflict:
* i. there are pending notifications of changes to ``foo``; * i\. there are pending notifications of changes to ``foo``;
* ii. the last-uploaded statinfo is either absent (i.e. there is * ii\. the last-uploaded statinfo is either absent (i.e. there is
no entry in the database for this path), or different from the no entry in the database for this path), or different from the
current statinfo; current statinfo;
* iii. either ``last_downloaded_uri`` or ``last_uploaded_uri`` * iii\. either ``dmd_last_downloaded_uri`` or ``db_entry.last_uploaded_uri``
(or both) are absent, or they are different. (or both) are absent, or they are different.
Otherwise, classify as an overwrite. Otherwise, classify as an overwrite.