docs/src/pull.md

Sat, 05 Aug 2017 11:33:17 +0200

author
Mike Becker <universe@uap-core.de>
date
Sat, 05 Aug 2017 11:33:17 +0200
changeset 281
ddb5e8f2a43d
parent 273
c743721d566f
child 282
3070d72f54af
permissions
-rw-r--r--

some more minor doc improvements

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

mercurial