• file
• latest
• revisions
• annotate
• diff
• comparison
• raw

docs/src/pull.md@3070d72f54af (annotated)

docs/src/pull.md

Sat, 05 Aug 2017 13:35:27 +0200

author

Mike Becker <universe@uap-core.de>

date

Sat, 05 Aug 2017 13:35:27 +0200

changeset 282

3070d72f54af

parent 273

c743721d566f

child 283

0e36bb75a732

permissions

-rw-r--r--

more minor improvements to the documentation

273 c743721d566f more documentation Olaf Wintermann <olaf.wintermann@gmail.com> parents: diff changeset	1	dav-sync pull
c743721d566f more documentation Olaf Wintermann <olaf.wintermann@gmail.com> parents: diff changeset	2	=============
c743721d566f more documentation Olaf Wintermann <olaf.wintermann@gmail.com> parents: diff changeset	3
c743721d566f more documentation Olaf Wintermann <olaf.wintermann@gmail.com> parents: diff changeset	4	**`pull [-cld] <directory>`**
c743721d566f more documentation Olaf Wintermann <olaf.wintermann@gmail.com> parents: diff changeset	5
c743721d566f more documentation Olaf Wintermann <olaf.wintermann@gmail.com> parents: diff changeset	6	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.
c743721d566f more documentation Olaf Wintermann <olaf.wintermann@gmail.com> parents: diff changeset	7
282 3070d72f54af more minor improvements to the documentation Mike Becker <universe@uap-core.de> parents: 273 diff changeset	8	When a trash directory is configured for the SyncDirectory, all files that would be deleted are instead moved to the trash directory.
273 c743721d566f more documentation Olaf Wintermann <olaf.wintermann@gmail.com> parents: diff changeset	9
282 3070d72f54af more minor improvements to the documentation Mike Becker <universe@uap-core.de> parents: 273 diff changeset	10	When backup-on-pull is enabled for the SyncDirectory, all files that would be overwritten are also moved to the trash.
273 c743721d566f more documentation Olaf Wintermann <olaf.wintermann@gmail.com> parents: diff changeset	11
282 3070d72f54af more minor improvements to the documentation Mike Becker <universe@uap-core.de> parents: 273 diff changeset	12	**`-c`** Disable conflict detection. This always overwrites locally modified files
273 c743721d566f more documentation Olaf Wintermann <olaf.wintermann@gmail.com> parents: diff changeset	13
c743721d566f more documentation Olaf Wintermann <olaf.wintermann@gmail.com> parents: diff changeset	14	**`-l`** Lock the repository before accessing it. After `pull` completed, the repository is unlocked
c743721d566f more documentation Olaf Wintermann <olaf.wintermann@gmail.com> parents: diff changeset	15
282 3070d72f54af more minor improvements to the documentation Mike Becker <universe@uap-core.de> parents: 273 diff changeset	16	**`-d`** Don't lock the repository (default)
273 c743721d566f more documentation Olaf Wintermann <olaf.wintermann@gmail.com> parents: diff changeset	17
c743721d566f more documentation Olaf Wintermann <olaf.wintermann@gmail.com> parents: diff changeset	18