From: Daira Hopwood Date: Thu, 28 May 2015 15:55:40 +0000 (+0100) Subject: Say that backup/temporary/conflicted filenames are ignored. X-Git-Url: https://git.rkrishnan.org/simplejson/components/%3C?a=commitdiff_plain;h=2875fb7b6db43d7ce95f534406e80a5e7d0e763c;p=tahoe-lafs%2Ftahoe-lafs.git Say that backup/temporary/conflicted filenames are ignored. 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 8af8486b..f840c865 100644 --- a/docs/proposed/magic-folder/remote-to-local-sync.rst +++ b/docs/proposed/magic-folder/remote-to-local-sync.rst @@ -284,6 +284,9 @@ at a predetermined frequency. On each poll, it will reread the parent DMD (to allow for added or removed clients), and then read each client DMD linked from the parent. +Files with names matching the patterns used for backup, temporary, and +conflicted files will be ignored, i.e. not synchronized in either direction. + Conflict Detection and Resolution ---------------------------------