docs/html/list-conflicts.html

Sun, 06 Oct 2019 13:27:24 +0200

author
Olaf Wintermann <olaf.wintermann@gmail.com>
date
Sun, 06 Oct 2019 13:27:24 +0200
changeset 650
14e7101d7604
parent 563
3dffe58a573f
child 704
8b88efcbf56f
permissions
-rw-r--r--

fix some hash based conflict resolution bugs and add tests for it

563
3dffe58a573f adds list-conflicts command to dav-sync
Mike Becker <universe@uap-core.de>
parents:
diff changeset
1 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
3dffe58a573f adds list-conflicts command to dav-sync
Mike Becker <universe@uap-core.de>
parents:
diff changeset
2 <html xmlns="http://www.w3.org/1999/xhtml">
3dffe58a573f adds list-conflicts command to dav-sync
Mike Becker <universe@uap-core.de>
parents:
diff changeset
3 <head>
3dffe58a573f adds list-conflicts command to dav-sync
Mike Becker <universe@uap-core.de>
parents:
diff changeset
4 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
3dffe58a573f adds list-conflicts command to dav-sync
Mike Becker <universe@uap-core.de>
parents:
diff changeset
5 <meta http-equiv="Content-Style-Type" content="text/css" />
3dffe58a573f adds list-conflicts command to dav-sync
Mike Becker <universe@uap-core.de>
parents:
diff changeset
6 <meta name="generator" content="pandoc" />
3dffe58a573f adds list-conflicts command to dav-sync
Mike Becker <universe@uap-core.de>
parents:
diff changeset
7 <title>dav-sync list-conflicts</title>
3dffe58a573f adds list-conflicts command to dav-sync
Mike Becker <universe@uap-core.de>
parents:
diff changeset
8 <style type="text/css">code{white-space: pre;}</style>
3dffe58a573f adds list-conflicts command to dav-sync
Mike Becker <universe@uap-core.de>
parents:
diff changeset
9 <link rel="stylesheet" href="davdoc.css" type="text/css" />
3dffe58a573f adds list-conflicts command to dav-sync
Mike Becker <universe@uap-core.de>
parents:
diff changeset
10 </head>
3dffe58a573f adds list-conflicts command to dav-sync
Mike Becker <universe@uap-core.de>
parents:
diff changeset
11 <body>
3dffe58a573f adds list-conflicts command to dav-sync
Mike Becker <universe@uap-core.de>
parents:
diff changeset
12 <div class="header">
3dffe58a573f adds list-conflicts command to dav-sync
Mike Becker <universe@uap-core.de>
parents:
diff changeset
13 <a href="./index.html"><span>DavUtils documentation</span></a>
3dffe58a573f adds list-conflicts command to dav-sync
Mike Becker <universe@uap-core.de>
parents:
diff changeset
14 </div>
3dffe58a573f adds list-conflicts command to dav-sync
Mike Becker <universe@uap-core.de>
parents:
diff changeset
15 <div class="sidebar">
3dffe58a573f adds list-conflicts command to dav-sync
Mike Becker <universe@uap-core.de>
parents:
diff changeset
16 <div class="nav">
3dffe58a573f adds list-conflicts command to dav-sync
Mike Becker <universe@uap-core.de>
parents:
diff changeset
17 <h3>dav</h3>
3dffe58a573f adds list-conflicts command to dav-sync
Mike Becker <universe@uap-core.de>
parents:
diff changeset
18 <ul>
3dffe58a573f adds list-conflicts command to dav-sync
Mike Becker <universe@uap-core.de>
parents:
diff changeset
19 <li><a href="getting-started.html">Getting started</a></li>
3dffe58a573f adds list-conflicts command to dav-sync
Mike Becker <universe@uap-core.de>
parents:
diff changeset
20 <li><a href="commands.html">Commands</a></li>
3dffe58a573f adds list-conflicts command to dav-sync
Mike Becker <universe@uap-core.de>
parents:
diff changeset
21 <ul>
3dffe58a573f adds list-conflicts command to dav-sync
Mike Becker <universe@uap-core.de>
parents:
diff changeset
22 <li><a href="list.html">list</a></li>
3dffe58a573f adds list-conflicts command to dav-sync
Mike Becker <universe@uap-core.de>
parents:
diff changeset
23 <li><a href="get.html">get</a></li>
3dffe58a573f adds list-conflicts command to dav-sync
Mike Becker <universe@uap-core.de>
parents:
diff changeset
24 <li><a href="put.html">put</a></li>
3dffe58a573f adds list-conflicts command to dav-sync
Mike Becker <universe@uap-core.de>
parents:
diff changeset
25 <li><a href="mkdir.html">mkdir</a></li>
3dffe58a573f adds list-conflicts command to dav-sync
Mike Becker <universe@uap-core.de>
parents:
diff changeset
26 <li><a href="remove.html">remove</a></li>
3dffe58a573f adds list-conflicts command to dav-sync
Mike Becker <universe@uap-core.de>
parents:
diff changeset
27 <li><a href="copy.html">copy</a></li>
3dffe58a573f adds list-conflicts command to dav-sync
Mike Becker <universe@uap-core.de>
parents:
diff changeset
28 <li><a href="move.html">move</a></li>
3dffe58a573f adds list-conflicts command to dav-sync
Mike Becker <universe@uap-core.de>
parents:
diff changeset
29 <li><a href="export.html">export</a></li>
3dffe58a573f adds list-conflicts command to dav-sync
Mike Becker <universe@uap-core.de>
parents:
diff changeset
30 <li><a href="import.html">import</a></li>
3dffe58a573f adds list-conflicts command to dav-sync
Mike Becker <universe@uap-core.de>
parents:
diff changeset
31 <li><a href="get-property.html">get-property</a></li>
3dffe58a573f adds list-conflicts command to dav-sync
Mike Becker <universe@uap-core.de>
parents:
diff changeset
32 <li><a href="set-property.html">set-property</a></li>
3dffe58a573f adds list-conflicts command to dav-sync
Mike Becker <universe@uap-core.de>
parents:
diff changeset
33 <li><a href="remove-property.html">remove-property</a></li>
3dffe58a573f adds list-conflicts command to dav-sync
Mike Becker <universe@uap-core.de>
parents:
diff changeset
34 <li><a href="lock.html">lock</a></li>
3dffe58a573f adds list-conflicts command to dav-sync
Mike Becker <universe@uap-core.de>
parents:
diff changeset
35 <li><a href="unlock.html">unlock</a></li>
3dffe58a573f adds list-conflicts command to dav-sync
Mike Becker <universe@uap-core.de>
parents:
diff changeset
36 <li><a href="info.html">info</a></li>
3dffe58a573f adds list-conflicts command to dav-sync
Mike Becker <universe@uap-core.de>
parents:
diff changeset
37 <li><a href="date.html">date</a></li>
3dffe58a573f adds list-conflicts command to dav-sync
Mike Becker <universe@uap-core.de>
parents:
diff changeset
38 <li><a href="add-repository.html">add-repository</a></li>
3dffe58a573f adds list-conflicts command to dav-sync
Mike Becker <universe@uap-core.de>
parents:
diff changeset
39 <li><a href="remove-repository.html">remove-repository</a></li>
3dffe58a573f adds list-conflicts command to dav-sync
Mike Becker <universe@uap-core.de>
parents:
diff changeset
40 <li><a href="list-repositories.html">list-repositories</a></li>
3dffe58a573f adds list-conflicts command to dav-sync
Mike Becker <universe@uap-core.de>
parents:
diff changeset
41 <li><a href="check-config.html">check-config</a></li>
3dffe58a573f adds list-conflicts command to dav-sync
Mike Becker <universe@uap-core.de>
parents:
diff changeset
42 </ul>
3dffe58a573f adds list-conflicts command to dav-sync
Mike Becker <universe@uap-core.de>
parents:
diff changeset
43 <li><a href="configuration.html">Configuration</a></li>
3dffe58a573f adds list-conflicts command to dav-sync
Mike Becker <universe@uap-core.de>
parents:
diff changeset
44 <li><a href="encryption.html">Encryption</a></li>
3dffe58a573f adds list-conflicts command to dav-sync
Mike Becker <universe@uap-core.de>
parents:
diff changeset
45 </ul>
3dffe58a573f adds list-conflicts command to dav-sync
Mike Becker <universe@uap-core.de>
parents:
diff changeset
46 </div>
3dffe58a573f adds list-conflicts command to dav-sync
Mike Becker <universe@uap-core.de>
parents:
diff changeset
47 <div class="nav">
3dffe58a573f adds list-conflicts command to dav-sync
Mike Becker <universe@uap-core.de>
parents:
diff changeset
48 <h3>dav-sync</h3>
3dffe58a573f adds list-conflicts command to dav-sync
Mike Becker <universe@uap-core.de>
parents:
diff changeset
49 <ul>
3dffe58a573f adds list-conflicts command to dav-sync
Mike Becker <universe@uap-core.de>
parents:
diff changeset
50 <li><a href="introduction.html">Introduction</a></li>
3dffe58a573f adds list-conflicts command to dav-sync
Mike Becker <universe@uap-core.de>
parents:
diff changeset
51 <li><a href="sync-commands.html">Commands</a></li>
3dffe58a573f adds list-conflicts command to dav-sync
Mike Becker <universe@uap-core.de>
parents:
diff changeset
52 <ul>
3dffe58a573f adds list-conflicts command to dav-sync
Mike Becker <universe@uap-core.de>
parents:
diff changeset
53 <li><a href="pull.html">pull</a></li>
3dffe58a573f adds list-conflicts command to dav-sync
Mike Becker <universe@uap-core.de>
parents:
diff changeset
54 <li><a href="push.html">push</a></li>
3dffe58a573f adds list-conflicts command to dav-sync
Mike Becker <universe@uap-core.de>
parents:
diff changeset
55 <li><a href="archive.html">archive</a></li>
3dffe58a573f adds list-conflicts command to dav-sync
Mike Becker <universe@uap-core.de>
parents:
diff changeset
56 <li><a href="list-conflicts.html">list-conflicts</a></li>
3dffe58a573f adds list-conflicts command to dav-sync
Mike Becker <universe@uap-core.de>
parents:
diff changeset
57 <li><a href="resolve-conflicts.html">resolve-conflicts</a></li>
3dffe58a573f adds list-conflicts command to dav-sync
Mike Becker <universe@uap-core.de>
parents:
diff changeset
58 <li><a href="delete-conflicts.html">delete-conflicts</a></li>
3dffe58a573f adds list-conflicts command to dav-sync
Mike Becker <universe@uap-core.de>
parents:
diff changeset
59 <li><a href="trash-info.html">trash-info</a></li>
3dffe58a573f adds list-conflicts command to dav-sync
Mike Becker <universe@uap-core.de>
parents:
diff changeset
60 <li><a href="empty-trash.html">empty-trash</a></li>
3dffe58a573f adds list-conflicts command to dav-sync
Mike Becker <universe@uap-core.de>
parents:
diff changeset
61 <li><a href="add-tag.html">add-tag</a></li>
3dffe58a573f adds list-conflicts command to dav-sync
Mike Becker <universe@uap-core.de>
parents:
diff changeset
62 <li><a href="remove-tag.html">remove-tag</a></li>
3dffe58a573f adds list-conflicts command to dav-sync
Mike Becker <universe@uap-core.de>
parents:
diff changeset
63 <li><a href="set-tags.html">set-tags</a></li>
3dffe58a573f adds list-conflicts command to dav-sync
Mike Becker <universe@uap-core.de>
parents:
diff changeset
64 <li><a href="list-tags.html">list-tags</a></li>
3dffe58a573f adds list-conflicts command to dav-sync
Mike Becker <universe@uap-core.de>
parents:
diff changeset
65 <li><a href="add-directory.html">add-directory</a></li>
3dffe58a573f adds list-conflicts command to dav-sync
Mike Becker <universe@uap-core.de>
parents:
diff changeset
66 <li><a href="list-directories.html">list-directories</a></li>
3dffe58a573f adds list-conflicts command to dav-sync
Mike Becker <universe@uap-core.de>
parents:
diff changeset
67 <li><a href="sync-check-config.html">check-config</a></li>
3dffe58a573f adds list-conflicts command to dav-sync
Mike Becker <universe@uap-core.de>
parents:
diff changeset
68 <li><a href="check-repositories.html">check-repositories</a></li>
3dffe58a573f adds list-conflicts command to dav-sync
Mike Becker <universe@uap-core.de>
parents:
diff changeset
69 </ul>
3dffe58a573f adds list-conflicts command to dav-sync
Mike Becker <universe@uap-core.de>
parents:
diff changeset
70 <li><a href="sync-configuration.html">Configuration</a></li>
3dffe58a573f adds list-conflicts command to dav-sync
Mike Becker <universe@uap-core.de>
parents:
diff changeset
71 </ul>
3dffe58a573f adds list-conflicts command to dav-sync
Mike Becker <universe@uap-core.de>
parents:
diff changeset
72 </div>
3dffe58a573f adds list-conflicts command to dav-sync
Mike Becker <universe@uap-core.de>
parents:
diff changeset
73 </div>
3dffe58a573f adds list-conflicts command to dav-sync
Mike Becker <universe@uap-core.de>
parents:
diff changeset
74
3dffe58a573f adds list-conflicts command to dav-sync
Mike Becker <universe@uap-core.de>
parents:
diff changeset
75 <!-- begin content -->
3dffe58a573f adds list-conflicts command to dav-sync
Mike Becker <universe@uap-core.de>
parents:
diff changeset
76 <div class="content">
3dffe58a573f adds list-conflicts command to dav-sync
Mike Becker <universe@uap-core.de>
parents:
diff changeset
77 <div id="header">
3dffe58a573f adds list-conflicts command to dav-sync
Mike Becker <universe@uap-core.de>
parents:
diff changeset
78 <h1 class="title">dav-sync list-conflicts</h1>
3dffe58a573f adds list-conflicts command to dav-sync
Mike Becker <universe@uap-core.de>
parents:
diff changeset
79 </div>
3dffe58a573f adds list-conflicts command to dav-sync
Mike Becker <universe@uap-core.de>
parents:
diff changeset
80 <p><strong><code>dav-sync list-conflicts [-v] &lt;directory&gt;</code></strong></p>
3dffe58a573f adds list-conflicts command to dav-sync
Mike Becker <universe@uap-core.de>
parents:
diff changeset
81 <p>Lists all conflicting files. If verbose output is enabled, the output also shows the number of entries for the same conflicting file.</p>
3dffe58a573f adds list-conflicts command to dav-sync
Mike Becker <universe@uap-core.de>
parents:
diff changeset
82 <p>For each conflict a backup file with the pattern <code>orig.N.filename</code> has been created. You can resolve the conflict by either deleting the backup, or replacing the conflicting file with the backup. In either case you don't need to do anything more and <code>dav-sync</code> will remove the conflict from the database automatically. You can also use the <a href="./delete-conflicts.html">delete-conflicts</a> command to bulk-delete all backups (in case you want to proceed with the upstream version of your files) or the <a href="./resolve-conflicts.html">resolve-conflicts</a> command to forcefully clear the conflict database.</p>
3dffe58a573f adds list-conflicts command to dav-sync
Mike Becker <universe@uap-core.de>
parents:
diff changeset
83 </div>
3dffe58a573f adds list-conflicts command to dav-sync
Mike Becker <universe@uap-core.de>
parents:
diff changeset
84 <!-- end content -->
3dffe58a573f adds list-conflicts command to dav-sync
Mike Becker <universe@uap-core.de>
parents:
diff changeset
85 </body>
3dffe58a573f adds list-conflicts command to dav-sync
Mike Becker <universe@uap-core.de>
parents:
diff changeset
86 </html>

mercurial