From: Daira Hopwood Date: Fri, 29 May 2015 01:55:38 +0000 (+0100) Subject: More formatting. X-Git-Url: https://git.rkrishnan.org/(%5B%5E?a=commitdiff_plain;h=36dddc54776950740ed9b34c37e1023605a67f51;p=tahoe-lafs%2Ftahoe-lafs.git More formatting. 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 a0906375..fd48e034 100644 --- a/docs/proposed/magic-folder/remote-to-local-sync.rst +++ b/docs/proposed/magic-folder/remote-to-local-sync.rst @@ -740,6 +740,7 @@ may be absent). Then the algorithm is: * 2c. Read the following information for the path ``foo`` from the local magic folder db: + * the *last-uploaded statinfo*, if any (this is the size in bytes, ``mtime``, and ``ctime`` stored in the ``local_files`` table when the file was last uploaded); @@ -748,6 +749,7 @@ may be absent). Then the algorithm is: Call this ``last_uploaded_uri``. * 2d. If any of the following are true, then classify as a conflict: + * there are pending notifications of changes to ``foo``; * the last-uploaded statinfo is either absent, or different from the current statinfo;