felixfoertsch/syncthing
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 10 Wiki Activity

Merge pull request #136 from kluppy/patch-4

Browse Source 
Clarify remote states when ignoreDelete selected
This commit is contained in:
Jakob Borg
2016-03-21 12:33:09 +01:00
parent 616a1d5d3c 1941ddf320
commit be75b6c28a
1 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
advanced/folder-ignoredelete.rst
+12 -3
View File
@@ -18,9 +18,18 @@ Bob deletes a file, it is deleted for Alice as well. When Alice deletes a
file, Bob ignores that update and does not delete the file.
In this state, Bob is fully up to date from his own point of view, as is Alice
from her own point of view. However from the point of view of Bob, who ignored
the delete entry from Alice, Alice is now out of date because she is missing
the file that was deleted.
from her own point of view.
However from the point of view of Alice, who deleted a file and propogated the
update, Bob is now out of date because he is yet to remove the file that was
deleted.
From the point of view of Bob, who ignored the delete entry from Alice, Alice
is now out of date because she is missing the file that was deleted.
.. note::
Bob may continue to see Alice as up to date until the next time
Syncthing is restarted on his device.
Should Bob modify any of the files that Alice has deleted, the update will be
sent to Alice and Alice will download the now updated file.