comparison: test/bin-test/test-dav-sync-pull-conflict.sh
test/bin-test/test-dav-sync-pull-conflict.sh
- changeset 637
- 20241338740c
- parent 635
- a6b1ec1b7ba0
- child 643
- 5b8643cf0a2f
equal
deleted
inserted
replaced
| 636:cbd62e87b1c5 | 637:20241338740c |
|---|---|
| 81 fi | 81 fi |
| 82 } | 82 } |
| 83 | 83 |
| 84 rm -f .dav/dav-sync-tests-test1a-db.xml | 84 rm -f .dav/dav-sync-tests-test1a-db.xml |
| 85 rm -f .dav/dav-sync-tests-test1b-db.xml | 85 rm -f .dav/dav-sync-tests-test1b-db.xml |
| 86 rm -f .dav/dav-sync-tests-test2a-db.xml | |
| 87 rm -f .dav/dav-sync-tests-test2b-db.xml | |
| 86 | 88 |
| 87 $DAV_BIN rm dav-test-repo/sync/test1 2> /dev/null | 89 $DAV_BIN rm dav-test-repo/sync/test1 2> /dev/null |
| 88 $DAV_BIN rm dav-test-repo/sync/test2 2> /dev/null | 90 $DAV_BIN rm dav-test-repo/sync/test2 2> /dev/null |
| 89 | 91 |
| 90 $DAV_BIN mkcol dav-test-repo/sync/test1 2> /dev/null | 92 $DAV_BIN mkcol dav-test-repo/sync/test1 2> /dev/null |
