docs/src/pull.md

Mon, 30 Oct 2017 16:29:07 +0100

author
Olaf Wintermann <olaf.wintermann@gmail.com>
date
Mon, 30 Oct 2017 16:29:07 +0100
changeset 336
6331271116d0
parent 285
02d3e4b1245f
child 409
90a6d6952d83
permissions
-rw-r--r--

some small fixes in tar.c

283
0e36bb75a732 adds dav-sync introduction and sync.xml documentation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 282
diff changeset
1 ---
0e36bb75a732 adds dav-sync introduction and sync.xml documentation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 282
diff changeset
2 title: 'dav-sync pull'
0e36bb75a732 adds dav-sync introduction and sync.xml documentation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 282
diff changeset
3 ---
273
c743721d566f more documentation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
4
285
02d3e4b1245f adds some small fixes for 1.0 release
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 283
diff changeset
5 **`dav-sync pull [-cld] <directory>`**
273
c743721d566f more documentation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
6
c743721d566f more documentation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
7 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
8
282
3070d72f54af more minor improvements to the documentation
Mike Becker <universe@uap-core.de>
parents: 273
diff changeset
9 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
10
282
3070d72f54af more minor improvements to the documentation
Mike Becker <universe@uap-core.de>
parents: 273
diff changeset
11 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
12
282
3070d72f54af more minor improvements to the documentation
Mike Becker <universe@uap-core.de>
parents: 273
diff changeset
13 **`-c`** Disable conflict detection. This always overwrites locally modified files
273
c743721d566f more documentation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
14
c743721d566f more documentation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
15 **`-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
16
282
3070d72f54af more minor improvements to the documentation
Mike Becker <universe@uap-core.de>
parents: 273
diff changeset
17 **`-d`** Don't lock the repository (default)
273
c743721d566f more documentation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
18
c743721d566f more documentation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
19

mercurial