comparison: test/bin-test/test-dav-sync-pull-conflict.sh
test/bin-test/test-dav-sync-pull-conflict.sh
- changeset 635
- a6b1ec1b7ba0
- parent 634
- 3ae1410b9d13
- child 637
- 20241338740c
equal
deleted
inserted
replaced
| 634:3ae1410b9d13 | 635:a6b1ec1b7ba0 |
|---|---|
| 88 $DAV_BIN rm dav-test-repo/sync/test2 2> /dev/null | 88 $DAV_BIN rm dav-test-repo/sync/test2 2> /dev/null |
| 89 | 89 |
| 90 $DAV_BIN mkcol dav-test-repo/sync/test1 2> /dev/null | 90 $DAV_BIN mkcol dav-test-repo/sync/test1 2> /dev/null |
| 91 $DAV_BIN mkcol dav-test-repo/sync/test2 2> /dev/null | 91 $DAV_BIN mkcol dav-test-repo/sync/test2 2> /dev/null |
| 92 | 92 |
| 93 # tmp sync dir | |
| 94 rm -Rf tmp-sync | |
| 95 mkdir tmp-sync | |
| 96 mkdir tmp-sync/test1a | |
| 97 mkdir tmp-sync/test1b | |
| 98 | |
| 93 # prepare | 99 # prepare |
| 94 cp synctest/file1 tmp-sync/test1a | 100 cp synctest/file1 tmp-sync/test1a |
| 95 cp synctest/file2 tmp-sync/test1a | 101 cp synctest/file2 tmp-sync/test1a |
| 96 | 102 |
| 97 mkdir tmp-sync/test1a/dir1/ | 103 mkdir tmp-sync/test1a/dir1/ |
