diff: 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
--- a/test/bin-test/test-dav-sync-pull-conflict.sh Sun Aug 25 11:42:55 2019 +0200 +++ b/test/bin-test/test-dav-sync-pull-conflict.sh Thu Aug 29 20:49:05 2019 +0200 @@ -90,6 +90,12 @@ $DAV_BIN mkcol dav-test-repo/sync/test1 2> /dev/null $DAV_BIN mkcol dav-test-repo/sync/test2 2> /dev/null +# tmp sync dir +rm -Rf tmp-sync +mkdir tmp-sync +mkdir tmp-sync/test1a +mkdir tmp-sync/test1b + # prepare cp synctest/file1 tmp-sync/test1a cp synctest/file2 tmp-sync/test1a
