Mercurial > hg > dav / file diff

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/docs/src/pull.md	Thu Aug 03 18:29:00 2017 +0200
@@ -0,0 +1,18 @@
+dav-sync pull
+=============
+
+**`pull [-cld] <directory>`**
+
+Pulls all changes from the server. All new or modified files are downloaded and all files deleted on the server are deleted locally. If a file is also locally modified and conflict detection is not disabled, the local file is renamed and an entry in the conflict database is added.
+
+When a trash directory is configured for the SyncDirectory, all files that should be deleted are moved to the trash directory.
+
+When backup-on-pull is enabled for the SyncDirectory, all files that should be overridden are moved to the trash.
+
+**`-c`** Disable conflict detection. This always overrides locally modified files
+
+**`-l`** Lock the repository before accessing it. After `pull` completed, the repository is unlocked
+
+**`-d`** Don't lock the repository
+
+